From: Koen Kooi <koen@openembedded.org>
Date: Sun, 8 Jan 2006 00:51:43 +0000 (+0000)
Subject: merge of b1dcd027693e6239eac9bebf42988acd618f1125
X-Git-Tag: Release-2010-05/1~9453^2~2707^2^2~11^2^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6934ec6391878e8fc231dccbd00922a804706c0b;p=openembedded.git

merge of b1dcd027693e6239eac9bebf42988acd618f1125
     and f7eb46be5e3e57b355a45440ee6c36224be527df
---

6934ec6391878e8fc231dccbd00922a804706c0b