merge of 40d5e9c9fe36e79128f6aa23880c5666be230cfc
authorGraeme Gregory <dp@xora.org.uk>
Tue, 18 Apr 2006 22:18:54 +0000 (22:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 18 Apr 2006 22:18:54 +0000 (22:18 +0000)
     and a2ab0d3faec30d3c8b605acc999e9380620e2e5f


Trivial merge