merge of '2d6a2dde48f3ee16a543a024c093a47c012f1427'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 13 May 2007 10:24:16 +0000 (10:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 13 May 2007 10:24:16 +0000 (10:24 +0000)
commit2bea7375a7a82f33e08be9369e76b9d39985efed
tree73240f13faf7d5df0524588810430d35a4f53ad5
parent31f5cc6e226bb4417a7da67ec321834e0432418a
parent779aaacee4584c68b6aae20d84b0e315509e4768
Merge ... '2d6a2dde48f3ee16a543a024c093a47c012f1427'
     and 'e473c8fe889e2c7c34d1435fd6da787b4ece049c'