From: Koen Kooi <koen@openembedded.org>
Date: Tue, 20 Dec 2005 13:41:26 +0000 (+0000)
Subject: merge of 86961384c74c6bc29d336fbabba45f0473a97806
X-Git-Tag: Release-2010-05/1~9453^2~2887^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1508ad8c67d53cd5b3de080f357f76a63e0cefc;p=openembedded.git

merge of 86961384c74c6bc29d336fbabba45f0473a97806
     and 99ec1d02032e8ba7478bee3ac54278a178f159a3
---

b1508ad8c67d53cd5b3de080f357f76a63e0cefc