From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 11 Jul 2007 11:01:15 +0000 (+0000)
Subject: merge of '83d9cf101f881f4f23bd0c33560c2179b08d8874'
X-Git-Tag: Release-2010-05/1~8868^2~174^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49778d7c8a0027c2920beba40fd42e5705db75b4;p=openembedded.git

Merge ... '83d9cf101f881f4f23bd0c33560c2179b08d8874'
     and 'beb1fc79f1a536fd48b5ecbd2bdfcb11369d5888'
---

49778d7c8a0027c2920beba40fd42e5705db75b4