merge of 3e6fa3a7826f139009a84b5f7f5a8ad4798c8b88
authorKoen Kooi <koen@openembedded.org>
Thu, 21 Jul 2005 21:29:41 +0000 (21:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jul 2005 21:29:41 +0000 (21:29 +0000)
     and a7ddc196fe367bfa8b749b05d35d405dda04c436


Trivial merge