merge of 4054569b89a8d88485aaad916e178d590735fbc8
authorMatthias Hentges <oe@hentges.net>
Wed, 12 Apr 2006 13:55:54 +0000 (13:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 12 Apr 2006 13:55:54 +0000 (13:55 +0000)
     and c3b8cac2c1fa73ceb8d9124d1eeaa80903dd4aa3


Trivial merge