merge of 32d7375b2a5f945b8a425da76292506a65ac81eb
authorRod Whitby <rod@whitby.id.au>
Sun, 21 May 2006 12:35:59 +0000 (12:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 May 2006 12:35:59 +0000 (12:35 +0000)
     and cb0c84fd84771c6e5354c1cd86a89fd04cfbced1


Trivial merge