From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Wed, 4 Jul 2007 22:37:44 +0000 (+0000)
Subject: merge of '554d1c13766299b9a5323f5553876072c65d7ff3'
X-Git-Tag: Release-2010-05/1~8868^2~216^2~4^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f02efa9319a9056e520ce853673a315e1d28d9a;p=openembedded.git

Merge ... '554d1c13766299b9a5323f5553876072c65d7ff3'
     and 'e25c5e38674da9988b268e6af89a90ecbbe1dac6'
---

6f02efa9319a9056e520ce853673a315e1d28d9a