From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Tue, 7 Feb 2006 22:34:17 +0000 (+0000)
Subject: merge of b6447bbbb5bade625f6d420c64aea5058cdd13f3
X-Git-Tag: Release-2010-05/1~9453^2~2407
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7000a872cc1e36466b42e42b7e5ddf2bb1a96a39;p=openembedded.git

merge of b6447bbbb5bade625f6d420c64aea5058cdd13f3
     and bc23517ec32ecd81c447b68448a9d895dc712e4c
---

7000a872cc1e36466b42e42b7e5ddf2bb1a96a39