merge of '2d9bb3f1e645b23643eaf7cf8ccc4f31c1b84f21'
authorKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 08:28:58 +0000 (08:28 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 08:28:58 +0000 (08:28 +0000)
commit5d9c001289bc5fffbcf15a69f866d914438c6140
tree2bf453a2786ca7633dc04dd797e3b5995757653e
parentb6d6e400005ee9a12a5c859609e3cb609c0d8dea
parent8f4ca08c42769081860c4f89d41d079fad9681c8
Merge ... '2d9bb3f1e645b23643eaf7cf8ccc4f31c1b84f21'
     and '873dfa47c10fc80c1aefe1dd805391a01b9124b9'