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

merge of 58369b166fb6519ed53ee159962ce2cba13e0d25
     and a39e3722ba9977f3df62824c663bfcaa56a9d5a5
---

7f4d17b172fad7bb3df71792e85526cbb3438424