From: Koen Kooi <koen@openembedded.org>
Date: Sun, 3 Sep 2006 07:24:56 +0000 (+0000)
Subject: merge of '0cb2088c75cd013fa4b79bb46028d9d384f0ef81'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~69
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5dfbd5e4c1f26b0bbf1f5f19e4028e2649ffc391;p=openembedded.git

Merge ... '0cb2088c75cd013fa4b79bb46028d9d384f0ef81'
     and 'ff7b9f5ef2329b56356a8adcbf70e4c4e9a3ecdb'
---

5dfbd5e4c1f26b0bbf1f5f19e4028e2649ffc391