From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sat, 29 Jul 2006 08:38:08 +0000 (+0000)
Subject: merge of 190f097c5ba012f104c1da5f3f25f62ca0d37160
X-Git-Tag: Release-2010-05/1~9453^2~1070
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fb4682b85de5d9c4812a9e1da531db644d278d8;p=openembedded.git

merge of 190f097c5ba012f104c1da5f3f25f62ca0d37160
     and 32f06dadf7c94b815b1d768767d05ac20f94e8a4
---

5fb4682b85de5d9c4812a9e1da531db644d278d8