From: Alex Bligh <alex@alex.org.uk>
Date: Sun, 22 May 2011 10:29:31 +0000 (+0100)
Subject: Merge branch 'master' of git://nbd.git.sourceforge.net/gitroot/nbd/nbd
X-Git-Url: http://git.alex.org.uk

Merge branch 'master' of git://nbd.git.sourceforge.net/gitroot/nbd/nbd
---

b12a9f9a7061f212c637da1b99a58236855fcd10