Merge branch 'master' of git://git.openpandora.org/openpandora.oe
authorDavid-John Willis <John.Willis@Distant-earth.com>
Thu, 3 Jun 2010 18:17:26 +0000 (19:17 +0100)
committerDavid-John Willis <John.Willis@Distant-earth.com>
Thu, 3 Jun 2010 18:17:26 +0000 (19:17 +0100)

Trivial merge