Merged from debian-sid.
authorEugene V. Lyubimkin <jackyf@1501-debian>
Fri, 7 Nov 2008 21:59:28 +0000 (23:59 +0200)
committerEugene V. Lyubimkin <jackyf@1501-debian>
Fri, 7 Nov 2008 21:59:28 +0000 (23:59 +0200)

Trivial merge