merge of 1c17f3bc992735c3812d224e4eec728fd12650f3
authorKoen Kooi <koen@openembedded.org>
Mon, 29 May 2006 13:38:10 +0000 (13:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 29 May 2006 13:38:10 +0000 (13:38 +0000)
     and 9c65cea979ed9596cf0a6ec6776d094ce174ea6a


Trivial merge