From: Koen Kooi <koen@openembedded.org>
Date: Fri, 24 Mar 2006 17:53:33 +0000 (+0000)
Subject: merge of 3668ee2a346de324f1a080ffc39842da7fd5a787
X-Git-Tag: Release-2010-05/1~9453^2~2112^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a8da533cbc386c4d03339ed56ca66bafddc816f;p=openembedded.git

merge of 3668ee2a346de324f1a080ffc39842da7fd5a787
     and de8c26e5b67b458b3707756fe2ac783f52b889b3
---

1a8da533cbc386c4d03339ed56ca66bafddc816f