merge of c5acd74e482d1e7de50bea58a79d8784225f2e5e
authorGraeme Gregory <dp@xora.org.uk>
Wed, 21 Jun 2006 10:16:24 +0000 (10:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Jun 2006 10:16:24 +0000 (10:16 +0000)
     and f44ffed4d1c961106d82ea95f9bb41d70cd60e66


Trivial merge