From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Fri, 9 Feb 2007 08:34:31 +0000 (+0000)
Subject: merge of '0397dd52df31390bf119eeb7aa7be8c09aec7c3f'
X-Git-Tag: Release-2010-05/1~9260
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80f8d4250b3b059d4621e23e1ea5ef69e0122729;p=openembedded.git

Merge ... '0397dd52df31390bf119eeb7aa7be8c09aec7c3f'
     and '80e6c1f2e38be33b588e77bffe86e1072cc043e7'
---

80f8d4250b3b059d4621e23e1ea5ef69e0122729