From: Koen Kooi <koen@openembedded.org>
Date: Mon, 7 Aug 2006 18:44:53 +0000 (+0000)
Subject: merge of 'a215524bc68709c948773354aab3283121aed094'
X-Git-Tag: Release-2010-05/1~9453^2~999^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4a3c084935bafbbdb3e5093c4584e17410f7b52;p=openembedded.git

Merge ... 'a215524bc68709c948773354aab3283121aed094'
     and 'bae05c897881f1de9bc358bed7a16439c27e7e5d'
---

b4a3c084935bafbbdb3e5093c4584e17410f7b52