merge of '2e808e7d7d04be00150c9a9ed0384baa6c7114f1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Jun 2007 14:14:00 +0000 (14:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Jun 2007 14:14:00 +0000 (14:14 +0000)
commit18f3936c10b0a7dc3bb32d4dd267ffad3fcd4be9
tree0ccdee9df076220ddb8f9b266175a49f9b92f96b
parent39042a95f2c91d0b2a86ba882623a86364dbe013
parentff0f7a45473e8efe9e6eeada036045c7b396b956
Merge ... '2e808e7d7d04be00150c9a9ed0384baa6c7114f1'
     and '88fc6a7d5e7c17322b154bdd942535cbca085e18'