merge of 1a01264e65b67ef85967a894ab8c3c3f4ceec72f
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Wed, 12 Jul 2006 18:45:01 +0000 (18:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 12 Jul 2006 18:45:01 +0000 (18:45 +0000)
     and 1fa6c1c3697b65f0d94b189442fe08e25d336652


Trivial merge