Merge branch 'gregoa' of colleen:bti into gregoa
authorgregor herrmann <gregoa@debian.org>
Sat, 19 Mar 2011 13:01:44 +0000 (14:01 +0100)
committergregor herrmann <gregoa@debian.org>
Sat, 19 Mar 2011 13:01:44 +0000 (14:01 +0100)

Trivial merge