merge of 2057bca5a2cf515271e6a43d7432ecd028f5dca5
authorKoen Kooi <koen@openembedded.org>
Sun, 8 Jan 2006 00:03:54 +0000 (00:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jan 2006 00:03:54 +0000 (00:03 +0000)
     and 72409a634bd5ef5e1a72c253a907fbec85506604


Trivial merge