merge of bd5f9b1ebde1d70cbb0331d6fe4e949ecb9eeb50
authorKoen Kooi <koen@openembedded.org>
Sat, 30 Jul 2005 21:02:51 +0000 (21:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 30 Jul 2005 21:02:51 +0000 (21:02 +0000)
     and d5c1c82a4f4d4259c9ae9a22865774bf9df663ca


Trivial merge