merge of 04349a15fcf0be8c719e5faa20f6d3b7173944ca
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Tue, 27 Jun 2006 20:51:14 +0000 (20:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 27 Jun 2006 20:51:14 +0000 (20:51 +0000)
     and 7817ada25bed9fc5f2f70a500853200cb2219b68


Trivial merge