merge of fab47ded5e1837c41db0c40cd772fe320c0c8a19
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Wed, 12 Jul 2006 18:45:46 +0000 (18:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 12 Jul 2006 18:45:46 +0000 (18:45 +0000)
     and 55d391274f060e7c8b1dc4c632bfcaf865f5fb26


Trivial merge