merge of 264f8902da57233dad1ce1345495ca9e2fa6e2d4
authorKoen Kooi <koen@openembedded.org>
Mon, 28 Nov 2005 21:15:25 +0000 (21:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Nov 2005 21:15:25 +0000 (21:15 +0000)
     and 6db5a6f376383e2d73ef38fa86ae25d51699b983


Trivial merge