Merge remote branch 'origin/master' into next-merge
authorAlex Williamson <alex.williamson@redhat.com>
Wed, 4 Sep 2013 17:25:44 +0000 (11:25 -0600)
committerAlex Williamson <alex.williamson@redhat.com>
Wed, 4 Sep 2013 17:25:44 +0000 (11:25 -0600)

Trivial merge