From: Graeme Gregory <dp@xora.org.uk>
Date: Fri, 7 Jul 2006 09:42:39 +0000 (+0000)
Subject: merge of d7d2b282dadda7b779a80c0f37b124c7ac66f441
X-Git-Tag: Release-2010-05/1~9453^2~1307
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e3e132b707f3b5471834ecb62aecef5d86ae9f7;p=openembedded.git

merge of d7d2b282dadda7b779a80c0f37b124c7ac66f441
     and f69048cb1da290493a5bd429ce6a81de777410d2
---

9e3e132b707f3b5471834ecb62aecef5d86ae9f7