merge of 8ea0fe4b0de92b762636231b067ef6a7f6137d01
authorMatthias Hentges <oe@hentges.net>
Sat, 11 Feb 2006 22:07:19 +0000 (22:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 11 Feb 2006 22:07:19 +0000 (22:07 +0000)
     and cdebeb67cbba4e5762ef25fd78a395ab287ada11


Trivial merge