merge of 135034cf51fecc3c52b45d1a26261b3b2d93bac6
authorRod Whitby <rod@whitby.id.au>
Mon, 20 Mar 2006 11:25:10 +0000 (11:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 20 Mar 2006 11:25:10 +0000 (11:25 +0000)
     and 599ce309bcded85efa1ed80fedea59fce4bb01ed


Trivial merge