From: Rene Wagner <rw@handhelds.org>
Date: Tue, 31 Jan 2006 20:39:42 +0000 (+0000)
Subject: merge of 5d621370cfba6997b82054d8ebf82dcda659f181
X-Git-Tag: Release-2010-05/1~9453^2~2473
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9e9b799c3a69b21294cccc5d25a3aa94ae4e321;p=openembedded.git

merge of 5d621370cfba6997b82054d8ebf82dcda659f181
     and c1c3a45fe3e2ec0eb7045cf3adb5dd0e4f31bbe2
---

c9e9b799c3a69b21294cccc5d25a3aa94ae4e321