From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 22 Jul 2008 13:36:26 +0000 (+0000)
Subject: merge of '21552d6d6a52b72f70dbeebd78da48da3acf2af8'
X-Git-Tag: Release-2010-05/1~6495
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d305cbc37c0a3163d82ecdc55927e7bc8d0eaaa;p=openembedded.git

Merge ... '21552d6d6a52b72f70dbeebd78da48da3acf2af8'
     and 'c04c9a166ef26b29f2dd6b75191fb1b7b586a9c6'
---

4d305cbc37c0a3163d82ecdc55927e7bc8d0eaaa