Merge branch 'gregoa' of colleen:bti into gregoa
authorgregor herrmann <gregoa@debian.org>
Sun, 19 Dec 2010 12:44:56 +0000 (13:44 +0100)
committergregor herrmann <gregoa@debian.org>
Sun, 19 Dec 2010 12:44:56 +0000 (13:44 +0100)

Trivial merge