merge of e025b5cfac5c9b13b6b61b1ab249e0dc1e946aa4
authorKoen Kooi <koen@openembedded.org>
Sat, 10 Sep 2005 15:54:43 +0000 (15:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 10 Sep 2005 15:54:43 +0000 (15:54 +0000)
     and e875d5b21b608761b99fc6c3af4060dc07bb2bbc


Trivial merge