merge of da1dc40350663056197750a19f00a46d20e267bf
authorGraeme Gregory <dp@xora.org.uk>
Mon, 20 Mar 2006 12:20:09 +0000 (12:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 20 Mar 2006 12:20:09 +0000 (12:20 +0000)
     and eef84004dea20080082b6e55d342f2a6fbe75b8e


Trivial merge