From: Koen Kooi <koen@openembedded.org>
Date: Sun, 9 Dec 2007 09:58:33 +0000 (+0000)
Subject: merge of 'ae600945a62c9f75e22c98c2d956b2d6f1d241e2'
X-Git-Tag: Release-2010-05/1~8171^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f64f1ff17065fd681ef5f7b7f3c991a8107ab40b;p=openembedded.git

Merge ... 'ae600945a62c9f75e22c98c2d956b2d6f1d241e2'
     and 'b1d80102a53f74c55cb0792f31a406f8c6fda540'
---

f64f1ff17065fd681ef5f7b7f3c991a8107ab40b