Merge branch 'org.openembedded.dreambox' of fraxinas@git.opendreambox.org:git/opendre...
authorFraxinas <andreas.frisch@multimedia-labs.de>
Thu, 4 Dec 2008 07:18:00 +0000 (08:18 +0100)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Thu, 4 Dec 2008 07:18:00 +0000 (08:18 +0100)
commit70fec0e08bcd2911645991fff3ecc5b274abaea0
tree5c21952abe17b3e20357cf200390b43e43d54d64
parent63d9305d5567c5acb2bc67daa9b1d44ef3fc58f5
parent1d13a0383445710cb7ae4e4a08867bd0a74276a4
Merge branch 'org.openembedded.dreambox' of fraxinas@git.opendreambox.org:git/opendreambox-1.5 into org.openembedded.dreambox