merge of dc7c705fcedc1c9da9d9db401066e753baeb3295
authorMike Westerhof <mwester@dls.net>
Wed, 19 Apr 2006 04:15:58 +0000 (04:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 19 Apr 2006 04:15:58 +0000 (04:15 +0000)
     and f52978a73f149023b1dbce805d5d1c088aeeabaf


Trivial merge