merge of 1a896e8bc4995403afa45f684796b5d56c8e5198
authorGraeme Gregory <dp@xora.org.uk>
Thu, 23 Mar 2006 10:21:51 +0000 (10:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 23 Mar 2006 10:21:51 +0000 (10:21 +0000)
     and 4e45961e2b4e4c3455a9d567510fc4a19841bbe5


Trivial merge