merge of 2356b89a5a998c175566c00320d564db9d1d78ba
authorGraeme Gregory <dp@xora.org.uk>
Fri, 17 Feb 2006 09:36:23 +0000 (09:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 17 Feb 2006 09:36:23 +0000 (09:36 +0000)
     and 62f57c5089eb06f79c609eda357b7623f837db33


Trivial merge