Commit 35597a759c91a414460eb8d4f9e138a64f317944

Eric Blake 2010-09-17T14:17:07

Merge branch 'maint'