Merge commit 'v0.9.12.1' into v0.9.12-maint

Done by 'git merge -s ours v0.9.12.1', so that the maint branch
will contain all release tags.

Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Eric Blake 2013-10-04 06:28:49 -06:00
commit c7f51ff247

Diff Content Not Available