From: Koen Kooi <koen@openembedded.org>
Date: Fri, 7 Dec 2007 10:53:23 +0000 (+0000)
Subject: merge of '105955293719b2a1414f1b03af410b8ff8dbdb1b'
X-Git-Tag: Release-2010-05/1~8180^2~9^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=911deca9a4a7865e38bc7cc17e84e04bf4f8d2ff;p=openembedded.git

Merge ... '105955293719b2a1414f1b03af410b8ff8dbdb1b'
     and 'e94fdfc4cfd1145195d512ee0bbf48e1ecaa41be'
---

911deca9a4a7865e38bc7cc17e84e04bf4f8d2ff