merge of 55cbddab59b09643a3b63cc4ee2b0e3868e00881
authorGraeme Gregory <dp@xora.org.uk>
Wed, 3 May 2006 17:55:21 +0000 (17:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 May 2006 17:55:21 +0000 (17:55 +0000)
     and 6c472154e33dc1921c2f82761fbaad9a37abebed


Trivial merge