Merged from debian-sid branch.
authorEugene V. Lyubimkin <jackyf@1501-debian>
Mon, 15 Dec 2008 17:31:54 +0000 (19:31 +0200)
committerEugene V. Lyubimkin <jackyf@1501-debian>
Mon, 15 Dec 2008 17:31:54 +0000 (19:31 +0200)

Trivial merge