From: Koen Kooi <koen@openembedded.org>
Date: Thu, 10 Aug 2006 13:56:00 +0000 (+0000)
Subject: merge of '7ffa21c0488fe0c49d50573aa879df722ab0c3a5'
X-Git-Tag: Release-2010-05/1~9453^2~996^2~1^2^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b2b3026d13d1fcdf66cfd9969c3c6549030375d;p=openembedded.git

Merge ... '7ffa21c0488fe0c49d50573aa879df722ab0c3a5'
     and 'f7b4e3c2936aace229411ee357133e0f675f04e7'
---

6b2b3026d13d1fcdf66cfd9969c3c6549030375d