From: Koen Kooi <koen@openembedded.org>
Date: Tue, 11 Sep 2007 19:33:16 +0000 (+0000)
Subject: merge of '25b0d6183d4d53adbc5ce34a2d340bbc33e6f317'
X-Git-Tag: Release-2010-05/1~8689^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22f3036743638f748c0505e30f2cd5da6e4aee30;p=openembedded.git

Merge ... '25b0d6183d4d53adbc5ce34a2d340bbc33e6f317'
     and '886e55ab15e14ba83c35f14677aae1a8d68c0f50'
---

22f3036743638f748c0505e30f2cd5da6e4aee30