merge of 878c33f63dddf26432371b39e5ac632427adb9a9
authorRod Whitby <rod@whitby.id.au>
Thu, 11 Aug 2005 10:21:07 +0000 (10:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 Aug 2005 10:21:07 +0000 (10:21 +0000)
     and f27802cb19bc2b8066af4e34ef08a08acd4f6203


Trivial merge