merge of 02ca6b9a1133a17f5e162779af2eaee48c4115dc
authorGraeme Gregory <dp@xora.org.uk>
Thu, 6 Jul 2006 10:27:57 +0000 (10:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Jul 2006 10:27:57 +0000 (10:27 +0000)
     and 5beb3d8e6566e09fca5c9db902bd8db27eb92282


Trivial merge