Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into...
authorFelix Domke <tmbinc@elitedvb.net>
Thu, 23 Oct 2008 21:50:26 +0000 (23:50 +0200)
committerFelix Domke <tmbinc@elitedvb.net>
Thu, 23 Oct 2008 21:50:26 +0000 (23:50 +0200)
commit303d33afcc1c1d7fda423ad5b79a49169b001b8d
treecd04b7a3280a09a23c51e7fdd04b2ca0fd9f153d
parentcffb6c93e6272000ec9cb8ebfbeef1e63ad46b8d
parente0557c284a769327c3eb800c16ed00bb2b49049f
Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into opendreambox

Conflicts:

packages/dsplink/codec-engine_2.21.bb
packages/dsplink/dsplink.inc
conf/checksums.ini
packages/dsplink/dsplink.inc