merge of 1ef2ba501604b3eb3973e0bd43a66f784236b00e
authorMatthias Hentges <oe@hentges.net>
Mon, 3 Apr 2006 10:40:42 +0000 (10:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Apr 2006 10:40:42 +0000 (10:40 +0000)
     and b7ea8a0106e07a1fdbbbfabfa918c24d0dd19d2f


Trivial merge