Merge branch 'org.openembedded.dreambox' of git://git.opendreambox.org/git/ghost...
authorFelix Domke <felix.domke@multimedia-labs.de>
Mon, 17 Aug 2009 21:35:19 +0000 (23:35 +0200)
committerFelix Domke <felix.domke@multimedia-labs.de>
Mon, 17 Aug 2009 21:35:19 +0000 (23:35 +0200)
commit25c8bb45fddd0b34930433f8440b621f4348176d
tree3eb0ce0da416800cae4118b0917e6031d5328479
parentd2fd5f61e63c33624d24af1be853e737af4d9fab
parent6ebd5d5704913a1f5c9a16864e9f8009dd6ab18d
Merge branch 'org.openembedded.dreambox' of git://git.opendreambox.org/git/ghost/opendreambox-1.5 into org.openembedded.dreambox