From: Koen Kooi <koen@openembedded.org>
Date: Mon, 3 Oct 2005 17:55:16 +0000 (+0000)
Subject: merge of 0f45b0c3fc2b6adfebfe80c87e5ad86cb75e9916
X-Git-Tag: Release-2010-05/1~9453^2~3380^2~3
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8705552f40dd62110da5515876999c940a5a0ac;p=openembedded.git

merge of 0f45b0c3fc2b6adfebfe80c87e5ad86cb75e9916
     and 87f377bfe2776b69f4fe99d93bd2d65a412aa45a
---

e8705552f40dd62110da5515876999c940a5a0ac