From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 16 Jun 2007 15:23:30 +0000 (+0000)
Subject: merge of '38fe196c64aa6b2afd09cdb99be2946bea1525fe'
X-Git-Tag: Release-2010-05/1~8868^2~364
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b94861e0b54a2de96ba15ff04a4f7a795df0767;p=openembedded.git

Merge ... '38fe196c64aa6b2afd09cdb99be2946bea1525fe'
     and 'adaa9b640ea26a4d78d99bcb88d2c7562a138c25'
---

3b94861e0b54a2de96ba15ff04a4f7a795df0767