merge of 4fe4838753ca7f23c9801afa9ecc94acdb3f3e2f
authorKoen Kooi <koen@openembedded.org>
Thu, 21 Jul 2005 23:52:53 +0000 (23:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jul 2005 23:52:53 +0000 (23:52 +0000)
     and c5b641f12e4ed0db849b6c4b6b75b5babd603514


Trivial merge