merge of 1a859e6bcdca12afc40c9375f5149e0a3eb3c0ea
authorGraeme Gregory <dp@xora.org.uk>
Thu, 4 May 2006 06:02:08 +0000 (06:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 4 May 2006 06:02:08 +0000 (06:02 +0000)
     and f7990c649bcbc8a7cfe1f3b8b415c33a4668460f


Trivial merge