merge of b0041ee48a666506c812a40e9060b22a24c30129
authorKoen Kooi <koen@openembedded.org>
Sat, 4 Feb 2006 17:09:10 +0000 (17:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 4 Feb 2006 17:09:10 +0000 (17:09 +0000)
     and b0704e33e45a8227abcb70a1857484bbc2f749e5


Trivial merge