merge of '25b0d6183d4d53adbc5ce34a2d340bbc33e6f317'
authorKoen Kooi <koen@openembedded.org>
Tue, 11 Sep 2007 19:33:16 +0000 (19:33 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 11 Sep 2007 19:33:16 +0000 (19:33 +0000)
commit22f3036743638f748c0505e30f2cd5da6e4aee30
tree171d8c0fa3f909dfafc750084b6ab0f41c81a972
parent723fce02c29fb1854500cd32cd31e51a269a4b73
parente4877edc320afbe9aab8187564348dc2e321d873
Merge ... '25b0d6183d4d53adbc5ce34a2d340bbc33e6f317'
     and '886e55ab15e14ba83c35f14677aae1a8d68c0f50'