From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Mon, 30 Apr 2007 14:16:16 +0000 (+0000)
Subject: merge of '548157e6cd17d49950d2b216414b1570f06705db'
X-Git-Tag: Release-2010-05/1~8868^2~660^2~3
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4797daf339a39e77b8ffbd7f7763f616788b371;p=openembedded.git

Merge ... '548157e6cd17d49950d2b216414b1570f06705db'
     and 'c543d0117473a500f955b26db8d404474a1506af'
---

a4797daf339a39e77b8ffbd7f7763f616788b371