merge of 0f45b0c3fc2b6adfebfe80c87e5ad86cb75e9916
authorKoen Kooi <koen@openembedded.org>
Mon, 3 Oct 2005 17:55:16 +0000 (17:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Oct 2005 17:55:16 +0000 (17:55 +0000)
     and 87f377bfe2776b69f4fe99d93bd2d65a412aa45a


Trivial merge