From: Koen Kooi <koen@openembedded.org>
Date: Tue, 14 Aug 2007 09:42:39 +0000 (+0000)
Subject: merge of '29c0c6efff11ca4f1cf8681ef59b975dc70b0738'
X-Git-Tag: Release-2010-05/1~8973^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=192b75fee20fbe56dd1cf3326ed77eb4729db37b;p=openembedded.git

Merge ... '29c0c6efff11ca4f1cf8681ef59b975dc70b0738'
     and '5da1612b322f56f442443b8546bbe8e7a75289f3'
---

192b75fee20fbe56dd1cf3326ed77eb4729db37b