From: Koen Kooi <koen@openembedded.org>
Date: Sat, 24 Mar 2007 17:37:22 +0000 (+0000)
Subject: merge of '6ca0327eb664414f4653bb5a14758c9b8138fcff'
X-Git-Tag: Release-2010-05/1~8868^2~1000
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c28b59d4bfaba12056b3e6f5c1ae39cabdf958df;p=openembedded.git

Merge ... '6ca0327eb664414f4653bb5a14758c9b8138fcff'
     and 'a86f58519a8606f6e3391ba31cc52760ef709b6d'
---

c28b59d4bfaba12056b3e6f5c1ae39cabdf958df