Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Wed, 4 Aug 2010 13:14:38 +0000 (15:14 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 4 Aug 2010 13:14:38 +0000 (15:14 +0200)

Trivial merge