From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 1 Mar 2007 06:08:20 +0000 (+0000)
Subject: merge of '5f7251c79e318f961c3b87d5a6f9b6b40e0998f7'
X-Git-Tag: Release-2010-05/1~9133^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87b7749e31a3d32c9fd03c9c3bde2fdef14c1eee;p=openembedded.git

Merge ... '5f7251c79e318f961c3b87d5a6f9b6b40e0998f7'
     and 'dd370e13186a72c61075beb8296b3418acfe5c67'
---

87b7749e31a3d32c9fd03c9c3bde2fdef14c1eee