Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Steve French [Wed, 16 Jun 2010 13:19:36 +0000 (13:19 +0000)]

Trivial merge