merge of 13813ab94ffee0d1aeb108014a63c4e4f408b77a
authorGraeme Gregory <dp@xora.org.uk>
Wed, 3 May 2006 20:19:52 +0000 (20:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 May 2006 20:19:52 +0000 (20:19 +0000)
     and b9e97e1ac980472265e7715ad0f37be8f9a86454


Trivial merge