From: Koen Kooi <koen@openembedded.org>
Date: Sat, 11 Mar 2006 18:51:17 +0000 (+0000)
Subject: merge of 5de21ce1146b76cf25440eddc66aaa8a9a984df9
X-Git-Tag: Release-2010-05/1~9453^2~2236^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2c415e2d5816bee9ac4c15e2443023877aec027;p=openembedded.git

merge of 5de21ce1146b76cf25440eddc66aaa8a9a984df9
     and 97dd2ea8547ce10b119dbe5649f9504851b72a0a
---

e2c415e2d5816bee9ac4c15e2443023877aec027