From: Koen Kooi <koen@openembedded.org>
Date: Fri, 7 Dec 2007 16:44:04 +0000 (+0000)
Subject: merge of '60155ceff0e3c21add064d22518f08c6b3c5a304'
X-Git-Tag: Release-2010-05/1~8180^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f76d287853dfed4aa309b8006f756f07e758d0c;p=openembedded.git

Merge ... '60155ceff0e3c21add064d22518f08c6b3c5a304'
     and 'b0dc261f9674aecabb4a43c73a328aaba4ec338a'
---

0f76d287853dfed4aa309b8006f756f07e758d0c