Merge branch 'master' into yaz4
authorAdam Dickmeiss <adam@indexdata.dk>
Sat, 28 Nov 2009 13:03:41 +0000 (14:03 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Sat, 28 Nov 2009 13:03:41 +0000 (14:03 +0100)
Conflicts:
configure.ac
debian/changelog


Trivial merge