merge of '4e4a2d2a3c172e0018ad8039dd9f8ac05a09e270'
authorKoen Kooi <koen@openembedded.org>
Sun, 12 Nov 2006 13:27:50 +0000 (13:27 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 12 Nov 2006 13:27:50 +0000 (13:27 +0000)
commit35fcead835867255bafc55566ef63df79ff3df7e
treedd0f0bffc076f3153f29634ececce2347a5babc9
parentd1b1231953cce26a8d087a087cc54d83b568c20a
parent75ceb3d82ed98c52ea5a937c4fa23d3bf386404f
Merge ... '4e4a2d2a3c172e0018ad8039dd9f8ac05a09e270'
     and 'd3403321e11792348c80c7e027874c49dd3ae4b1'