merge of 4214be31dc929ef728c46eb617bd9385b68e80ab
authorCliff Brake <cbrake@bec-systems.com>
Mon, 5 Jun 2006 19:17:04 +0000 (19:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Jun 2006 19:17:04 +0000 (19:17 +0000)
     and 6eb5952227d26f1c755d7d9af24ae7ae32987068


Trivial merge