merge of 09145a14348a2af665ea728569482e08b09fc8e3
authorGraeme Gregory <dp@xora.org.uk>
Tue, 4 Jul 2006 14:59:18 +0000 (14:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Jul 2006 14:59:18 +0000 (14:59 +0000)
     and 814f9767254f5c0f553184e9854c534c3b22953a


Trivial merge