merge of '4bc8cc047648935876ee77c832ac802bb2411919'
authorKoen Kooi <koen@openembedded.org>
Thu, 3 May 2007 07:32:49 +0000 (07:32 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 3 May 2007 07:32:49 +0000 (07:32 +0000)
commit273fa5ea04201d36325dabf156dba7a8470caf39
tree78a419176a3bad7ebda7f2eefd40fa04a0fa6726
parenta7b6e851a98ac94ba654c2372a3b1b1d0775bbde
parentec256ea93311f711be06c6dbba3af225fab7ca9f
Merge ... '4bc8cc047648935876ee77c832ac802bb2411919'
     and '813e5c48efd70de54894dd747857e21994a78024'