From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Fri, 7 Dec 2007 12:26:52 +0000 (+0000)
Subject: merge of '01ae5b27f3e0a00ab17a31f68cf002afac6cb807'
X-Git-Tag: Release-2010-05/1~8180^2~4^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa67f38042381471573479188684ba5bf017010a;p=openembedded.git

Merge ... '01ae5b27f3e0a00ab17a31f68cf002afac6cb807'
     and '0e4a2bbb7147a46977d9c8085b4fd469d11ab2a2'
---

aa67f38042381471573479188684ba5bf017010a