merge of 1db2f2b8a272dbada8a2ce16756fbd5d1e2a143d
authorKoen Kooi <koen@openembedded.org>
Mon, 17 Apr 2006 12:42:48 +0000 (12:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 17 Apr 2006 12:42:48 +0000 (12:42 +0000)
     and 2e6ce2c10f58ef5ccf8c16264fdf62c387da283c


Trivial merge