merge of '0605804319cd93683b89d41fc3fa77a06a21e0af'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Sep 2008 19:39:33 +0000 (19:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Sep 2008 19:39:33 +0000 (19:39 +0000)
commit1afd7b0bd9371f8bb52f7f63edcbca4e4e2af998
treec51768894b95d590d12aa30aafb74aa3aad1e5d9
parent2f619f93a43b7ec5108c51c516d22882be18e6e7
parentf72ffdabd6a262a88011b712e9c991bb2ee4f576
Merge ... '0605804319cd93683b89d41fc3fa77a06a21e0af'
     and 'baa20636fd4d4cb1c0b3dbeb154bbab5f11d5443'