merge of '5d78367052376f9cb5cf1254ebd88c2b1a03a2e7'
authorKoen Kooi <koen@openembedded.org>
Fri, 29 Sep 2006 20:51:24 +0000 (20:51 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 29 Sep 2006 20:51:24 +0000 (20:51 +0000)
commitae3df8736aa5aa88b9c7d7f52f2265bf1fb24ef8
treef5e9ef8f01457625ae95e4b7e89f89777d5cf9d4
parent07dadf5ebdc456d127dea37b14f8232b466ff64b
parent3123faca484adb68e0bb77de716b00024a82f086
Merge ... '5d78367052376f9cb5cf1254ebd88c2b1a03a2e7'
     and 'ab8a258812c46a5d12ee3f0b5fc0de34ecc26d38'