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)
commit2c6ee4674414649702101081de0fbd2293722388
tree1064d28da61c609b4e250734a3714c36f69adc12
parent1ab870f6f75b5183c4217e61e4fc858205b14ecd
parent98eff3a28e3cee9f8ad334e7eda72fb1a9718e90
Merge branch 'master' of git://git.openpandora.org/openpandora.oe