merge of b69c981e27fd4ef4c385796d80f1095b8859ce1c
authorGraeme Gregory <dp@xora.org.uk>
Fri, 5 May 2006 14:25:05 +0000 (14:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 May 2006 14:25:05 +0000 (14:25 +0000)
     and c75247f1df9bd969d70c5d008f7faf430c842080


Trivial merge