merge of 0bd531ea93535099ce9029cd8d58fdc46c8e8cdd
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 28 Jul 2005 11:26:30 +0000 (11:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 11:26:30 +0000 (11:26 +0000)
     and cf227662bf5075a64cb22a8e517fa3a4ed9a6b45


Trivial merge