From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Thu, 23 Aug 2007 08:33:32 +0000 (+0000)
Subject: merge of '3a4584bc4628ec0badfbd77badf7bbaaff7bfb93'
X-Git-Tag: Release-2010-05/1~8826^2~8^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=366a376daf8a57a863ea9fed1d0ca9f9a899da7f;p=openembedded.git

Merge ... '3a4584bc4628ec0badfbd77badf7bbaaff7bfb93'
     and '52b1e168dedcb5e20f1e063682ea6e64af003ffe'
---

366a376daf8a57a863ea9fed1d0ca9f9a899da7f