From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Mon, 20 Feb 2006 14:05:03 +0000 (+0000)
Subject: merge of 1077a62e5a0cf3a585d0b28b763970cb1f9495ff
X-Git-Tag: Release-2010-05/1~9453^2~2307
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=446dbdbddfd76fcfda718014e836136d97bb7b30;p=openembedded.git

merge of 1077a62e5a0cf3a585d0b28b763970cb1f9495ff
     and 84f39d6ce58c1d05af73e9efc4431efad132f997
---

446dbdbddfd76fcfda718014e836136d97bb7b30