merge of 01f1ccec23eb7fc423ff878a513ff4a2aa0847b4
authorGraeme Gregory <dp@xora.org.uk>
Tue, 30 May 2006 14:14:46 +0000 (14:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 30 May 2006 14:14:46 +0000 (14:14 +0000)
     and 1ebed2257b095d2f7f67acd91f0979bd1f8c79a9


Trivial merge