From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 25 Mar 2008 00:51:35 +0000 (+0000)
Subject: merge of '848c6e3f16104e7b87568edf06d0d9cc79b5e860'
X-Git-Tag: Release-2010-05/1~7280^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5974b53400d03b7b7640172bead99aad3905ba37;p=openembedded.git

Merge ... '848c6e3f16104e7b87568edf06d0d9cc79b5e860'
     and 'aff156eb3c821fe61a4b7788e1da432c621d1383'
---

5974b53400d03b7b7640172bead99aad3905ba37