merge of 030151d3784053d0f38b8d3ce7c867b65b9de8be
authorRod Whitby <rod@whitby.id.au>
Wed, 26 Apr 2006 16:37:40 +0000 (16:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 26 Apr 2006 16:37:40 +0000 (16:37 +0000)
     and b97fadfd2eab8eb429ad031bc7e591cf3cddc31a


Trivial merge