merge of 039788d041fbc01b3a9b583c254eec64a5d3b578
authorKoen Kooi <koen@openembedded.org>
Mon, 3 Jul 2006 11:20:33 +0000 (11:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Jul 2006 11:20:33 +0000 (11:20 +0000)
     and 577114f4e4b115482dac5f45be9585d19cb94f37


Trivial merge