merge of '73cd766816e9208e9486f1d0730123cf56b98a13'
authorKoen Kooi <koen@openembedded.org>
Fri, 7 Sep 2007 08:19:55 +0000 (08:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 7 Sep 2007 08:19:55 +0000 (08:19 +0000)
commit1eaac97897027aa22c6bd93c16ad00d55b85e471
tree63903bead6834386981f21635eab93aaeacfeeb2
parentf7637ba582fcafd1dbe74614288522d479f9f95a
parent7e06adaf53832038c97b9a7914caac1879c81617
Merge ... '73cd766816e9208e9486f1d0730123cf56b98a13'
     and 'ab566828f65e3118a463af4edd4374ec860dc16b'