From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 25 Aug 2007 23:52:48 +0000 (+0000)
Subject: merge of '958bac4da4de63f8fadb3d84361a07eee1bd3246'
X-Git-Tag: Release-2010-05/1~8789^2~27^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a37d232cb35608026da46499ba8524fc41e9470;p=openembedded.git

Merge ... '958bac4da4de63f8fadb3d84361a07eee1bd3246'
     and 'f4021a8051081d380813f73eed127182fda51b45'
---

4a37d232cb35608026da46499ba8524fc41e9470