merge of 'a98e93456176d74c80a713ff53caef9f3ad4027e'
authorKoen Kooi <koen@openembedded.org>
Thu, 19 Jul 2007 12:45:04 +0000 (12:45 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 19 Jul 2007 12:45:04 +0000 (12:45 +0000)
commit210096920c0f9f51df535cdce94f0592b8e2492c
tree24f08fc899158efd5b1c5e011df0de2b7cfe86b3
parentaa9066ff91080f12c9d37ac5c94c1e6b463cdc8e
parent03f6c4d7b05500268f546bc9e2001028880bb47f
Merge ... 'a98e93456176d74c80a713ff53caef9f3ad4027e'
     and 'cea8793a75c42eb3027ed8b7aac39a6bd8cdc931'