Merge branch 'maint' into branch-1.11
authorEric Blake <eblake@redhat.com>
Thu, 25 Aug 2011 18:46:11 +0000 (12:46 -0600)
committerEric Blake <eblake@redhat.com>
Thu, 25 Aug 2011 18:46:11 +0000 (12:46 -0600)
1  2 
ChangeLog

diff --cc ChangeLog
Simple merge