From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 20 Mar 2008 12:24:54 +0000 (+0000)
Subject: merge of '25b9e259d256dba0e7e78b122b1880331d820762'
X-Git-Tag: Release-2010-05/1~7106^2^2~3^2^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=878425ebbfd687f787069e033aa65db93b440a84;p=openembedded.git

Merge ... '25b9e259d256dba0e7e78b122b1880331d820762'
     and '776dc04c7eba19512692b4d40a123d45e6adb862'
---

878425ebbfd687f787069e033aa65db93b440a84