merge of 58369b166fb6519ed53ee159962ce2cba13e0d25
authorKoen Kooi <koen@openembedded.org>
Sun, 8 Jan 2006 01:18:00 +0000 (01:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jan 2006 01:18:00 +0000 (01:18 +0000)
     and a39e3722ba9977f3df62824c663bfcaa56a9d5a5


Trivial merge