merge of 211ee08c16c0bff5c1b6c495d484747ddec7fb0d
authorRod Whitby <rod@whitby.id.au>
Thu, 2 Feb 2006 13:30:24 +0000 (13:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 2 Feb 2006 13:30:24 +0000 (13:30 +0000)
     and e35f8ca17cb59e4448784d22e1c01c2f627e970f


Trivial merge