From: Koen Kooi <koen@openembedded.org>
Date: Tue, 22 Aug 2006 11:08:53 +0000 (+0000)
Subject: merge of '1cbd1bde7832b3e86e5c8ad0fabfa6a90408baf5'
X-Git-Tag: Release-2010-05/1~9453^2~911^2~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=117b467cb9535d0276ba74a36b3fbd71207a666b;p=openembedded.git

Merge ... '1cbd1bde7832b3e86e5c8ad0fabfa6a90408baf5'
     and 'ca20876bde8f155d49159fb19e6254cf4eaf0b43'
---

117b467cb9535d0276ba74a36b3fbd71207a666b