From: Koen Kooi <koen@openembedded.org>
Date: Sat, 8 Jul 2006 14:33:26 +0000 (+0000)
Subject: merge of 2e3b25afd1276eaa7c2205ada5c506c1a6e8df5e
X-Git-Tag: Release-2010-05/1~9453^2~1287^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=592ad7f90afcc2bfac021f3fa3631d0ce26ed8cb;p=openembedded.git

merge of 2e3b25afd1276eaa7c2205ada5c506c1a6e8df5e
     and 2eff0430ea1b3fe81d0bd31a6d70b1ac317bee6e
---

592ad7f90afcc2bfac021f3fa3631d0ce26ed8cb