From: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Date: Thu, 27 Mar 2008 18:45:00 +0000 (+0000)
Subject: merge of '487f86d7da4356e5d8c6832b7ff5f0ee9ab8c293'
X-Git-Tag: Release-2010-05/1~7262^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bab0bc1011c17ac35ac7499b3db23fa85419e05f;p=openembedded.git

Merge ... '487f86d7da4356e5d8c6832b7ff5f0ee9ab8c293'
     and 'd1dfc5df9769c50ec5328454ab737f091f6c573f'
---

bab0bc1011c17ac35ac7499b3db23fa85419e05f