From: Koen Kooi <koen@openembedded.org>
Date: Mon, 28 Aug 2006 21:55:22 +0000 (+0000)
Subject: merge of 'bea143d94e8d276b8e97bf1f82928984f2ac040a'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~66^2~30
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8da48eaf0ed3faf44ae043f5521872e08b35ad82;p=openembedded.git

Merge ... 'bea143d94e8d276b8e97bf1f82928984f2ac040a'
     and 'fc1c689a5d9b893171f7d1effdb3acf96ea757df'
---

8da48eaf0ed3faf44ae043f5521872e08b35ad82