UBUNTU: rebase fixes Bug #710371
authorAndy Whitcroft <apw@canonical.com>
Wed, 16 Feb 2011 12:14:09 +0000 (12:14 +0000)
committerLeann Ogasawara <leann.ogasawara@canonical.com>
Mon, 28 Mar 2011 13:54:00 +0000 (06:54 -0700)
commitf60eb77231d9f3235d9c653d6eedae185ae9e189
treeb287b341ef063f6260ec9eacb3b93455fdca6ae3
parent7c70b85f0eb523e832aadcb64524be05ad527421
UBUNTU: rebase fixes Bug #710371

Ignore: yes

Signed-off-by: Andy Whitcroft <apw@canonical.com>
debian.master/changelog