merge of 426f329c095d506a4beca58b86c1f674c3f3aaff
authorGraeme Gregory <dp@xora.org.uk>
Tue, 4 Apr 2006 12:05:17 +0000 (12:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Apr 2006 12:05:17 +0000 (12:05 +0000)
     and 6881dd1f7588781d1430c0f6307b856be66ee86d


Trivial merge