merge of 47dce11edfa131d098408e653487b0f793394e95
authorKoen Kooi <koen@openembedded.org>
Sun, 8 Jan 2006 00:35:22 +0000 (00:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jan 2006 00:35:22 +0000 (00:35 +0000)
     and 61486dc9a1b23e7088c746a1a9d6c6199cc8f5a5


Trivial merge