Merge branch 'gregoa' of colleen:bti into gregoa
authorgregor herrmann <gregoa@debian.org>
Sun, 2 Jan 2011 15:40:02 +0000 (16:40 +0100)
committergregor herrmann <gregoa@debian.org>
Sun, 2 Jan 2011 15:40:02 +0000 (16:40 +0100)

Trivial merge