merge of 599ce309bcded85efa1ed80fedea59fce4bb01ed
authorGraeme Gregory <dp@xora.org.uk>
Mon, 20 Mar 2006 11:18:35 +0000 (11:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 20 Mar 2006 11:18:35 +0000 (11:18 +0000)
     and a75588bf3d13c632212591d3b3732e536b5910f7


Trivial merge