From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 26 May 2007 07:57:41 +0000 (+0000)
Subject: merge of '480683c7159495a79be8eb396d93cb882bc195cf'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~34^2~2^2~5^2^2^2~1^2~2^2^2~2^2^2~6^2^2~1^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=183a24d6309bd95b3d5d0c1f28aaf09ff4b3807c;p=openembedded.git

Merge ... '480683c7159495a79be8eb396d93cb882bc195cf'
     and 'db1728ec4eb0f06b07e6e7376cff9b934b0b6de1'
---

183a24d6309bd95b3d5d0c1f28aaf09ff4b3807c