merge of 214b4c4e7d773cc8d94d28db3d1f88d20f67c976
authorKoen Kooi <koen@openembedded.org>
Fri, 30 Jun 2006 09:10:01 +0000 (09:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 30 Jun 2006 09:10:01 +0000 (09:10 +0000)
     and 75ab5e8a308a9e33d98460b70c311d02f6b50737


Trivial merge