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

Trivial merge