Merge commit 'origin/next' into kvm-ppc-next
authorAlexander Graf <agraf@suse.de>
Wed, 17 Apr 2013 13:20:38 +0000 (15:20 +0200)
committerAlexander Graf <agraf@suse.de>
Wed, 17 Apr 2013 13:20:38 +0000 (15:20 +0200)

Trivial merge