merge of 6d9a6d263913c8c725780872fe2f13329fcfb1b8
authorMike Westerhof <mwester@dls.net>
Thu, 25 May 2006 05:24:21 +0000 (05:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 May 2006 05:24:21 +0000 (05:24 +0000)
     and e974c19c3971f18d2c208cce51bc722e476920be


Trivial merge