merge of 3f0a9654c9edcee221d5d5fbb4421a37e22afb38
authorRod Whitby <rod@whitby.id.au>
Mon, 24 Apr 2006 21:31:06 +0000 (21:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Apr 2006 21:31:06 +0000 (21:31 +0000)
     and 888bba9e9eb91ecf014ac024cdb877b7aa217b38


Trivial merge