From: Matthias Hentges <oe@hentges.net>
Date: Wed, 12 Apr 2006 15:33:27 +0000 (+0000)
Subject: merge of 08f8592df7cccc3c4e3e8320dc207aea052520d4
X-Git-Tag: Release-2010-05/1~9453^2~2059
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61f450b1440fb4a374b6dbd0d3cada721f777282;p=openembedded.git

merge of 08f8592df7cccc3c4e3e8320dc207aea052520d4
     and de96ee4ffd6b983d21a661eea91670155cdf3192
---

61f450b1440fb4a374b6dbd0d3cada721f777282