From: Koen Kooi <koen@openembedded.org>
Date: Fri, 13 Oct 2006 10:40:41 +0000 (+0000)
Subject: merge of '8aa0a2deaca11c572f50a69143d5615291b53252'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~211
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7560299ed0f2707a38c7fb6c380aba11d3154413;p=openembedded.git

Merge ... '8aa0a2deaca11c572f50a69143d5615291b53252'
     and 'fbafee3316502a2cb328539afae729d307064ecd'
---

7560299ed0f2707a38c7fb6c380aba11d3154413