merge of 'ddac71d079db394f27c2b51f7967ea038d63a347'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 7 Dec 2007 16:08:04 +0000 (16:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 7 Dec 2007 16:08:04 +0000 (16:08 +0000)
commit3b3ab5506e44fe8fa991435aaacd5edb6a51c1af
treeda75d777eb3ca91fca4e9862e2adeb1bc2ae2a26
parent5a563442195a2bdc36911cb173890dbd209895aa
parentbee4fd5863fce88b4b8e7a9d7a37d2f6d8c1f947
Merge ... 'ddac71d079db394f27c2b51f7967ea038d63a347'
     and 'f9718212cc877376dcd4cf9ffaf6991c4522d628'