merge of 61de3f0b56891aca58e64a61d937595181f9775f
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sat, 6 May 2006 21:32:32 +0000 (21:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 6 May 2006 21:32:32 +0000 (21:32 +0000)
     and 80048cf191d1060dd47d9f015de3baefa7d87ebc


Trivial merge