From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sat, 21 Oct 2006 11:05:57 +0000 (+0000)
Subject: merge of '09016de82e8089016031f1df831bdc386449eec6'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~57
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9842fcbe255b19d4949502aae2735ecf6141c187;p=openembedded.git

Merge ... '09016de82e8089016031f1df831bdc386449eec6'
     and '4b0133764e1b19133abfc5dd0dccaadce5f5593a'
---

9842fcbe255b19d4949502aae2735ecf6141c187