merge of 439207523733c6dc2f0ffd852ac72717fc3f50a6
authorRod Whitby <rod@whitby.id.au>
Thu, 29 Jun 2006 19:47:18 +0000 (19:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Jun 2006 19:47:18 +0000 (19:47 +0000)
     and 7847e7c8b41faf980a8a08156c7c8a5bc616f814


Trivial merge