merge of 581f5aa6a9e2ed12faf8cb8a5ef31c0ee8938ce9
authorMike Westerhof <mwester@dls.net>
Thu, 27 Apr 2006 06:38:03 +0000 (06:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 27 Apr 2006 06:38:03 +0000 (06:38 +0000)
     and 5bf4a93ceb9a1548b1b6aa4edf7c57d003106351


Trivial merge