From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 4 Dec 2007 01:17:48 +0000 (+0000)
Subject: merge of 'a861d7ae9f7e1ef52c56fcb6017fe9b7c48dc72b'
X-Git-Tag: Release-2010-05/1~8234
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=894335a1acd1fabdb37c25773ffdd0f795f570c4;p=openembedded.git

Merge ... 'a861d7ae9f7e1ef52c56fcb6017fe9b7c48dc72b'
     and 'faf33dcbfd35dd67bb0aea23b73e2eed42cd7226'
---

894335a1acd1fabdb37c25773ffdd0f795f570c4