merge of 89964d35598b9173cc7fd75859aa0b768501903f
authorRod Whitby <rod@whitby.id.au>
Fri, 14 Apr 2006 18:12:38 +0000 (18:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Apr 2006 18:12:38 +0000 (18:12 +0000)
     and a13b076d623fdb8b0a21940bc4ec1cb87292cff2


Trivial merge