From: Koen Kooi <koen@openembedded.org>
Date: Thu, 27 Oct 2005 11:44:05 +0000 (+0000)
Subject: merge of e71cbbac1a1c86b7f928f7544426e7898a11f8a8
X-Git-Tag: Release-2010-05/1~9453^2~3177
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bc32ea2631bcac726f2d6d56981e8e2a9454b10;p=openembedded.git

merge of e71cbbac1a1c86b7f928f7544426e7898a11f8a8
     and f2e0bbc6dec992f45e0ed6f0bace32fbf6560baa
---

2bc32ea2631bcac726f2d6d56981e8e2a9454b10