merge of 3b1e5467e63df0caf15791330cc41c5557e0eedd
authorRod Whitby <rod@whitby.id.au>
Wed, 8 Feb 2006 21:16:52 +0000 (21:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 21:16:52 +0000 (21:16 +0000)
     and 81310a82efd8fa4b4ce7bd707ed734f3ce153c46


Trivial merge