From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 29 Nov 2006 10:53:45 +0000 (+0000)
Subject: merge of '18d45ae122d3ca0b93e65c8b3dd5b5d599faa353'
X-Git-Tag: Release-2010-05/1~9453^2~238
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=161de35501fc0166133a322973336628eb7d1485;p=openembedded.git

Merge ... '18d45ae122d3ca0b93e65c8b3dd5b5d599faa353'
     and 'f7da96343a9468e225f1e148365b297adad82ad5'
---

161de35501fc0166133a322973336628eb7d1485