merge of 342833fc535c445a294f2410ec5d5684b77ae37a
authorGraeme Gregory <dp@xora.org.uk>
Fri, 28 Apr 2006 11:51:19 +0000 (11:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 28 Apr 2006 11:51:19 +0000 (11:51 +0000)
     and 6c75ab5216efc0e63263169572f0eac15fd9fa90


Trivial merge