From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Thu, 19 Apr 2007 17:34:42 +0000 (+0000)
Subject: merge of '9e2ea1f2a87bc495597a9bda44b7d5921358c104'
X-Git-Tag: Release-2010-05/1~8868^2~683
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=140ca073d04adb99248b5a850838ac4ed3af11e2;p=openembedded.git

Merge ... '9e2ea1f2a87bc495597a9bda44b7d5921358c104'
     and 'd18552e5056a026d8ed8959e135b2fa05c3e1b6b'
---

140ca073d04adb99248b5a850838ac4ed3af11e2