Commit a7122ebe28e35ff3d1226ecb2a70520f1bec14bc

Eric Blake 2011-08-25T12:46:19

Merge branch 'maint'