merge of '16b18b01df378ad0f697c10d317c111597758115'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jul 2008 13:56:46 +0000 (13:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jul 2008 13:56:46 +0000 (13:56 +0000)
commit83b4adb291b2b04a927f80036ffee727d23a9cfc
treee9d37ded98e245bb0cc0eead47202bf79c099d8a
parent1454581b4c4950bf63402c56e7a500e2815bbbde
parentfc4339ab6190700841cccb856df2288a885893ad
Merge ... '16b18b01df378ad0f697c10d317c111597758115'
     and '932cae8c439fdcbb8ef77c53d64c68c31d21f984'