From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 22 Jun 2008 05:09:10 +0000 (+0000)
Subject: merge of '5844f7ce240f1f2384ef005a811a248bba06b798'
X-Git-Tag: Release-2010-05/1~6650^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=110c279a7514fb265c35e5ba1c307dca712fcd27;p=openembedded.git

Merge ... '5844f7ce240f1f2384ef005a811a248bba06b798'
     and '6bb990986456ff3426f2678aeba4e0950cfce81a'
---

110c279a7514fb265c35e5ba1c307dca712fcd27