merge of 27f2a826933d2cb6c774d60011191463985ec017
authorKoen Kooi <koen@openembedded.org>
Sun, 24 Jul 2005 10:02:03 +0000 (10:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 24 Jul 2005 10:02:03 +0000 (10:02 +0000)
     and b56b830a66e07da73eba26b6134ecf0360e9d735


Trivial merge