From: Koen Kooi <koen@openembedded.org>
Date: Wed, 4 Oct 2006 13:26:53 +0000 (+0000)
Subject: merge of 'd70f986456dbed534668139d7aff0d7ddbd4d10e'
X-Git-Tag: Release-2010-05/1~9453^2~615^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40efe2bbed3940f1a6acdf11d70ffb9c097782a1;p=openembedded.git

Merge ... 'd70f986456dbed534668139d7aff0d7ddbd4d10e'
     and 'e0c1d149111b1270a0ae00ae100635a5a0be3051'
---

40efe2bbed3940f1a6acdf11d70ffb9c097782a1