From: Koen Kooi <koen@openembedded.org>
Date: Fri, 23 Nov 2007 09:46:49 +0000 (+0000)
Subject: merge of '4ca8a8b2d3b5c23e0df60d228c5549695910a24b'
X-Git-Tag: Release-2010-05/1~8305
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3b492daea36dcd417b30225dd9c87518d4f6d1b;p=openembedded.git

Merge ... '4ca8a8b2d3b5c23e0df60d228c5549695910a24b'
     and 'ec9b4188f1f043fd13783ea1ed8a13f349a862d8'
---

a3b492daea36dcd417b30225dd9c87518d4f6d1b