merge r6415-6416 from trunk
authorDana Jansens <danakj@orodu.net>
Sun, 13 May 2007 00:21:01 +0000 (00:21 +0000)
committerDana Jansens <danakj@orodu.net>
Sun, 13 May 2007 00:21:01 +0000 (00:21 +0000)
commit63b8dcf27f07b629f6945e7860d6f42e0d6e714f
tree72c1e885707d6857b273e66494002aab882309f8
parentf5238ed626ff498cbcefd951366c7f47b20c74a8
merge r6415-6416 from trunk
debian/conffiles [new file with mode: 0644]