merge from debian branch
authorMark Hymers <mhy@debian.org>
Wed, 14 May 2008 19:37:13 +0000 (20:37 +0100)
committerMark Hymers <mhy@debian.org>
Wed, 14 May 2008 19:37:13 +0000 (20:37 +0100)
1  2 
ud-generate

diff --cc ud-generate
Simple merge