merge of 4214be31dc929ef728c46eb617bd9385b68e80ab
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Mon, 5 Jun 2006 21:16:14 +0000 (21:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Jun 2006 21:16:14 +0000 (21:16 +0000)
     and f0fb79930fa609615c8b1233c06c57a2f22a3109


Trivial merge