criss-cross merge with my sid branch
authorDavid Kalnischkies <kalnischkies@gmail.com>
Wed, 17 Feb 2010 23:48:02 +0000 (00:48 +0100)
committerDavid Kalnischkies <kalnischkies@gmail.com>
Wed, 17 Feb 2010 23:48:02 +0000 (00:48 +0100)

Trivial merge