From: Matthias Hentges <oe@hentges.net>
Date: Sat, 13 May 2006 22:16:31 +0000 (+0000)
Subject: merge of 29e6764d0920c0357aa34e6e348e962da7fd316f
X-Git-Tag: Release-2010-05/1~9453^2~1705
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cab3617a57c2308ef14d43acfe4d3db8fbaf6c74;p=openembedded.git

merge of 29e6764d0920c0357aa34e6e348e962da7fd316f
     and f10f5c840e362f84286526ff42c23d83c7c73e62
---

cab3617a57c2308ef14d43acfe4d3db8fbaf6c74