From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 12 Mar 2008 22:29:15 +0000 (+0000)
Subject: merge of '6047723508e3b6eeb7bb92d452b11b5e946540bf'
X-Git-Tag: Release-2010-05/1~7494^2~9^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e3f09a4cf3647cffa687723676aecb53316da53;p=openembedded.git

Merge ... '6047723508e3b6eeb7bb92d452b11b5e946540bf'
     and 'd30c6b8bd3c20b5346a9fd726b241df1917bf08e'
---

4e3f09a4cf3647cffa687723676aecb53316da53