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)
commit92882f28b62e1997a81f61f56b3a7cb0e0b8b127
tree591877a66681fff118cd7413d79bd7ea4390c76a
parentc0e103e4dacffd9d9348cc753eaf89405564df98
parent446fa40081ab2602dcad9ebdfc4564e63fed1c76
merge trunk