merge of 3d32d5cfdac5307f5ee1b8a7f9cf0f1c79278f03
authorRod Whitby <rod@whitby.id.au>
Sat, 22 Apr 2006 20:09:45 +0000 (20:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 22 Apr 2006 20:09:45 +0000 (20:09 +0000)
     and 43a75ed46b48268d256b6ff9a4879e4cf15589d3


Trivial merge