From: Koen Kooi <koen@openembedded.org>
Date: Mon, 31 Oct 2005 21:23:02 +0000 (+0000)
Subject: merge of 1c33e529dab473350372fd8e8e18d1322fe7aa8a
X-Git-Tag: Release-2010-05/1~9453^2~3161
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48eae77b77b8f0bb236036dacb80562bd7a16bf6;p=openembedded.git

merge of 1c33e529dab473350372fd8e8e18d1322fe7aa8a
     and 63568fa256744014488cd1f4983565c78db1f166
---

48eae77b77b8f0bb236036dacb80562bd7a16bf6