From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Sat, 17 May 2008 15:35:34 +0000 (+0000)
Subject: merge of '6f7c6c0d226901d61dbd149693b1d376efe3b4d2'
X-Git-Tag: Release-2010-05/1~6912
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=726d25774f3b5651c9797742f0d919477f1b7f21;p=openembedded.git

Merge ... '6f7c6c0d226901d61dbd149693b1d376efe3b4d2'
     and 'bbe1f43b109ad4a796a0fb8e5edee36e28a20276'
---

726d25774f3b5651c9797742f0d919477f1b7f21