From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Thu, 31 Aug 2006 21:23:31 +0000 (+0000)
Subject: merge of '2994aa36c2fc770f17f1156ec1d07bb4890f2c1c'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~122
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9814adc8f6e4c83701ab3f1f0d9503bb2fcd348c;p=openembedded.git

Merge ... '2994aa36c2fc770f17f1156ec1d07bb4890f2c1c'
     and '73e50ed2ac3eec8ff383c4b49eb7dac23c9663bf'
---

9814adc8f6e4c83701ab3f1f0d9503bb2fcd348c