Merge branch 'master' into names
authorWouter Verhelst <w@uter.be>
Tue, 27 Jul 2010 22:54:37 +0000 (18:54 -0400)
committerWouter Verhelst <w@uter.be>
Tue, 27 Jul 2010 22:54:37 +0000 (18:54 -0400)
1  2 
nbd-client.c

diff --cc nbd-client.c
Simple merge