merge of 0db003fda92c4fe80ee76010788aa8e895b485eb
authorKoen Kooi <koen@openembedded.org>
Wed, 22 Feb 2006 11:06:23 +0000 (11:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 22 Feb 2006 11:06:23 +0000 (11:06 +0000)
commit74a200152a3e40b0897a164328a48d3c88c31384
tree3522465f380bf4c5d15700ceb0725089b96ed58f
parentfdc9958bc3e33f43ead639f6a3acef0f744f9c4b
parent7fa138a2e324eba3776c73e81a23ca0e471ce212
merge of 0db003fda92c4fe80ee76010788aa8e895b485eb
     and 84edeec7571f3127230e5ca62b68488474946bcf