From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Wed, 9 Jul 2008 19:07:51 +0000 (+0000)
Subject: merge of '2b98fc6fe63ab6d8f550bd5e53546e27d970f533'
X-Git-Tag: Release-2010-05/1~6563
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10be83b24e06a983e8fb8bb7f80377befaf55cb7;p=openembedded.git

Merge ... '2b98fc6fe63ab6d8f550bd5e53546e27d970f533'
     and '6263ba0e14af7bb1eb9f572dc90726e8be06ae51'
---

10be83b24e06a983e8fb8bb7f80377befaf55cb7