Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Fri, 23 Apr 2010 00:08:44 +0000 (02:08 +0200)
committerJiri Kosina <jkosina@suse.cz>
Fri, 23 Apr 2010 00:08:44 +0000 (02:08 +0200)

Trivial merge