merge of 0b8c4181555b825cbd5881514e7b734305e69368
authorCliff Brake <cbrake@bec-systems.com>
Tue, 6 Jun 2006 12:25:16 +0000 (12:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 Jun 2006 12:25:16 +0000 (12:25 +0000)
     and 0d0dcc009c37fcecc54e97eba35a6168bb1b18a4


Trivial merge