Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Wed, 16 Jun 2010 16:08:13 +0000 (18:08 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 16 Jun 2010 16:08:13 +0000 (18:08 +0200)

Trivial merge