Merge commit 'origin/master' into kvm-ppc-3.8
authorAlexander Graf <[email protected]>
Sun, 6 Jan 2013 13:02:03 +0000 (14:02 +0100)
committerAlexander Graf <[email protected]>
Sun, 6 Jan 2013 13:02:03 +0000 (14:02 +0100)

Trivial merge