merge of 5e069de84dc8d0ae51245045a22e3495ec81393d
authorKoen Kooi <koen@openembedded.org>
Tue, 26 Jul 2005 11:16:30 +0000 (11:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 26 Jul 2005 11:16:30 +0000 (11:16 +0000)
     and bebf3d3ba6e6b56ee7785b02e70331b4222dc590


Trivial merge