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

Trivial merge