merge of 'ad632a7eb7f054624190b7f4503868e9c174c9b6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 22 Aug 2007 09:02:46 +0000 (09:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 22 Aug 2007 09:02:46 +0000 (09:02 +0000)
commit46a07820304c1f03851e903c30387d29fdd17903
treeede0bf7bbcb885eefbfe3208e9b8921ab9988c3a
parentae963420f1b8404e660f339062c76bdfb74928ee
parentb7b8bb3faaeb002e5e36f8a478a4cdf7e938dcb5
Merge ... 'ad632a7eb7f054624190b7f4503868e9c174c9b6'
     and 'ba5f0bfd65d0f4a53bb92b3488758f3be847e612'