Merge commit 'origin/org.openembedded.dev' into org.openembedded.dev
authorMichael 'Mickey' Lauer <mickey@vanille-media.de>
Wed, 10 Feb 2010 13:33:57 +0000 (14:33 +0100)
committerMichael 'Mickey' Lauer <mickey@vanille-media.de>
Wed, 10 Feb 2010 13:33:57 +0000 (14:33 +0100)
commitb75cb91f845d1871e159398c1315ece2119fee2d
treea08dc27d8d6239414d26baefa4641d2e13d65d9f
parent8448a620e252208acbed9d4c6776c86d34186d99
parent6224275aa357ed61282253d9a1a1eddf432ceef1
Merge commit 'origin/org.openembedded.dev' into org.openembedded.dev

Conflicts:

conf/checksums.ini
conf/checksums.ini