From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Sun, 13 May 2007 16:43:36 +0000 (+0000)
Subject: merge of '5d1b115fdc0cd4dcc8356e8e2c5aaeca756b6e99'
X-Git-Tag: Release-2010-05/1~8868^2~522
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc46eaa94c935969e09fab78bfd32460cc5ea8f4;p=openembedded.git

Merge ... '5d1b115fdc0cd4dcc8356e8e2c5aaeca756b6e99'
     and '8eb20a3d94e5271bda273e384d5e24346ccb0e86'
---

fc46eaa94c935969e09fab78bfd32460cc5ea8f4