merge of 0f2f529b92dbcf9e16ad45331308b7b059bfbfc7
authorKoen Kooi <koen@openembedded.org>
Wed, 7 Sep 2005 10:16:00 +0000 (10:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Sep 2005 10:16:00 +0000 (10:16 +0000)
commitb57f55b0c0c3c619f7d5850a2de4a91c5dbc4958
treee9518e2c5bce4652b94f521b3bdede5b8c2d62f6
parent60e4096ee61a290969982df4a22d53a4fc56cd34
parent548c09a83700a0898a7969c661f5add82993f7db
merge of 0f2f529b92dbcf9e16ad45331308b7b059bfbfc7
     and 81fb073242cc3af84d2044617f4f235d8c219c04