merge of 'ad84690ef54c978b3fd21e3ff2283954120c9df2'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 30 Apr 2008 10:27:26 +0000 (10:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 30 Apr 2008 10:27:26 +0000 (10:27 +0000)
commitf6d356667e9986fcec01c915bdc0b9abf6512faf
tree4e9c0240260ab11ad70d0c7a21c770f09ebe0cd6
parente9d7da1e99d765abc02bd6765c2525420b7c6702
parent04dedbd2b127de9e96d71522c6a83a623686be38
Merge ... 'ad84690ef54c978b3fd21e3ff2283954120c9df2'
     and 'f5044968cbc23730cf02b860f0c615b6f1664d4e'