From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 30 Aug 2007 10:34:13 +0000 (+0000)
Subject: merge of '249c76d0a12f930196eb04dbaed9848311cd283a'
X-Git-Tag: Release-2010-05/1~8776^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b15697d7674074f1a5806518ff2d9b6c61f7877;p=openembedded.git

Merge ... '249c76d0a12f930196eb04dbaed9848311cd283a'
     and 'f7b8fecab0a891e883df73b811b50dae38261186'
---

0b15697d7674074f1a5806518ff2d9b6c61f7877