From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 18 Jan 2006 09:47:05 +0000 (+0000)
Subject: merge of 5bd9649f2ec60851738e4ceea6409f7ea11daa85
X-Git-Tag: Release-2010-05/1~9453^2~2629^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7baad9d5da4393e8c4873d2f53b7c6ce775547e9;p=openembedded.git

merge of 5bd9649f2ec60851738e4ceea6409f7ea11daa85
     and b4a513218154eb17b59ed896ac7e0037ab11fc14
---

7baad9d5da4393e8c4873d2f53b7c6ce775547e9