From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Wed, 28 Mar 2007 15:40:45 +0000 (+0000)
Subject: merge of '53fc298d41b61bb31958787f71e60f0ada0ea33d'
X-Git-Tag: Release-2010-05/1~8868^2~946
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b1a6c9f5b4e26ccbd401e544f973d61fc1b3eea;p=openembedded.git

Merge ... '53fc298d41b61bb31958787f71e60f0ada0ea33d'
     and '802b2506dd668da5a8ecfb587a125d087042597a'
---

5b1a6c9f5b4e26ccbd401e544f973d61fc1b3eea