From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 4 Nov 2007 16:34:48 +0000 (+0000)
Subject: merge of '73811d7124650e66801380a8372e169d5ed3e6bf'
X-Git-Tag: Release-2010-05/1~8454^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56bbcefb2c81c9c543a04138445337c07cbe7069;p=openembedded.git

Merge ... '73811d7124650e66801380a8372e169d5ed3e6bf'
     and 'f76a52136a0ce25511ba98b2e3b3b6d52dd6af11'
---

56bbcefb2c81c9c543a04138445337c07cbe7069