merge of '2c36c1352880077becd0896d3b153e75f8b5f0ac'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 May 2008 19:19:11 +0000 (19:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 May 2008 19:19:11 +0000 (19:19 +0000)
commit4ca81325484f9aba79c3953b7ff2e995721f4e24
treec4b8b087e630e25783a49a22af15a8bd88e5a65a
parent5a613f4f7b25f022fbee52670f9b2ffb9b6a90f3
parent157622c3f37e03c9b53d0304ed7b57f604786301
Merge ... '2c36c1352880077becd0896d3b153e75f8b5f0ac'
     and 'a9d44faec0ce331d83a20afa025ec1454530c6bb'