merge of 6167902f8756810f12305f33e05925c1b2811f0c
authorKoen Kooi <koen@openembedded.org>
Mon, 28 Nov 2005 21:17:46 +0000 (21:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Nov 2005 21:17:46 +0000 (21:17 +0000)
     and e57b306d5d33aa84cfa65719890862b92749d01a


Trivial merge