Merge branch 'master' of git://git.openpandora.org/openpandora.oe
authorDavid-John Willis <John.Willis@Distant-earth.com>
Tue, 11 May 2010 11:28:29 +0000 (12:28 +0100)
committerDavid-John Willis <John.Willis@Distant-earth.com>
Tue, 11 May 2010 11:28:29 +0000 (12:28 +0100)

Trivial merge