From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 23 Oct 2007 11:13:36 +0000 (+0000)
Subject: merge of '53cc62f49c8608e5ffa07ac066958e28d5113f8e'
X-Git-Tag: Release-2010-05/1~8454^2~165^2~6^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63b6a95c46ecabc46ad5ac81ea8ff72897731e82;p=openembedded.git

Merge ... '53cc62f49c8608e5ffa07ac066958e28d5113f8e'
     and '61fa8bae987fbc94312beed01805ad1e118a1638'
---

63b6a95c46ecabc46ad5ac81ea8ff72897731e82