merge trunk
authorColin Watson <cjwatson@ubuntu.com>
Tue, 4 Jan 2011 15:51:41 +0000 (15:51 +0000)
committerColin Watson <cjwatson@ubuntu.com>
Tue, 4 Jan 2011 15:51:41 +0000 (15:51 +0000)

Trivial merge