From: Koen Kooi <koen@openembedded.org>
Date: Wed, 14 May 2008 20:01:07 +0000 (+0000)
Subject: merge of '1b152d2cb9b2c6474294b89bcc5f136f0cd95903'
X-Git-Tag: Release-2010-05/1~6939^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc84e99b863d7d65abd8f0dfc4784e5999e9f0c8;p=openembedded.git

Merge ... '1b152d2cb9b2c6474294b89bcc5f136f0cd95903'
     and '9acacf300b9ee3fb7ed2a73b88356b44ad0ab8d5'
---

fc84e99b863d7d65abd8f0dfc4784e5999e9f0c8