Merge branch 'master' of git://nbd.git.sourceforge.net/gitroot/nbd/nbd
authorAlex Bligh <alex@alex.org.uk>
Tue, 17 May 2011 10:14:35 +0000 (11:14 +0100)
committerAlex Bligh <alex@alex.org.uk>
Tue, 17 May 2011 10:14:35 +0000 (11:14 +0100)

Trivial merge