From: Koen Kooi <koen@openembedded.org>
Date: Tue, 31 Jul 2007 16:13:30 +0000 (+0000)
Subject: merge of '8961e177cdb0b701e3bb0304ec24d5c4a3947254'
X-Git-Tag: Release-2010-05/1~8868^2~62^2~27^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3aecefc3fec909cf0b8208a345b98be27de068aa;p=openembedded.git

Merge ... '8961e177cdb0b701e3bb0304ec24d5c4a3947254'
     and 'e3756fffb6fe48cc7854ecab0ddfe07c21359f15'
---

3aecefc3fec909cf0b8208a345b98be27de068aa