merge of 85ce4d79fae4bbf21ee27afa6cadff190cb23d74
authorMatthias Hentges <oe@hentges.net>
Wed, 29 Mar 2006 03:39:46 +0000 (03:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 29 Mar 2006 03:39:46 +0000 (03:39 +0000)
     and 8b2c130927694fe1f0de26c5a8a79d3d247f6b57


Trivial merge