merge of 889a2048fa859be73c244aeb31e982b29d624283
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sat, 1 Jul 2006 17:08:25 +0000 (17:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 1 Jul 2006 17:08:25 +0000 (17:08 +0000)
     and a2b34b40d487e97340ef024b0d3bb91a7b8385b5


Trivial merge