merge of a0cb602edb3bf2f732004fc35bed483bf4b559f7
authorKoen Kooi <koen@openembedded.org>
Wed, 12 Jul 2006 15:55:08 +0000 (15:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 12 Jul 2006 15:55:08 +0000 (15:55 +0000)
     and bc5f5478302c34ee064f2f5e7ca8c51c0e226de5


Trivial merge