From: Graeme Gregory <dp@xora.org.uk>
Date: Fri, 12 Oct 2007 09:47:15 +0000 (+0000)
Subject: merge of '152391f4367c4184f3b73eb8fa296c0a57a369b5'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~83
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bbcac135959090d03fa4422e14799ca4664fa6a;p=openembedded.git

Merge ... '152391f4367c4184f3b73eb8fa296c0a57a369b5'
     and '2d894aa798e84e7893b67bcfe840faae8e260df1'
---

1bbcac135959090d03fa4422e14799ca4664fa6a