merge of 2e750f1fb2ff29c22b1870939bd30694fa946cb9
authorKoen Kooi <koen@openembedded.org>
Wed, 5 Jul 2006 12:13:24 +0000 (12:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 5 Jul 2006 12:13:24 +0000 (12:13 +0000)
commite1bd3cc552ae42afee55f76255a8a7d2656f9252
treeaf4d648de0e6abdaabd56615b3f92f942acc35aa
parentc54502116a5bb2985a28a3ac11380d46d2b28c93
parent31d29bc3fc70189155f55351000b8447e03fcbd3
merge of 2e750f1fb2ff29c22b1870939bd30694fa946cb9
     and 6261935e463d6a8bd4cbd2436a1aea7030843591