From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 21 Jul 2007 23:24:57 +0000 (+0000)
Subject: merge of '4f67bea2562b34f365d7ca6807e88dc68459418f'
X-Git-Tag: Release-2010-05/1~8868^2~117
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18467e7fecc84b830d131d000d24335d9b2212b4;p=openembedded.git

Merge ... '4f67bea2562b34f365d7ca6807e88dc68459418f'
     and 'd7f98d5dc21d49fa11962464baefb4ec32e5b204'
---

18467e7fecc84b830d131d000d24335d9b2212b4