From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 5 Sep 2007 09:04:35 +0000 (+0000)
Subject: merge of '13890ee4d20d70e06eada225797e62e3847248e9'
X-Git-Tag: Release-2010-05/1~8718^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d158d7d1127cbcf9075b2ebfb1f8d9271d969ad;p=openembedded.git

Merge ... '13890ee4d20d70e06eada225797e62e3847248e9'
     and '5337c2ae1bddb02aff4358e400f0a8697f0f961a'
---

5d158d7d1127cbcf9075b2ebfb1f8d9271d969ad