Merge testing branch into master
authorGreg Kroah-Hartman <gregkh@suse.de>
Wed, 12 Jan 2011 19:03:16 +0000 (11:03 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 12 Jan 2011 19:03:34 +0000 (11:03 -0800)

Trivial merge