From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 30 Nov 2007 11:41:06 +0000 (+0000)
Subject: merge of '0a81de11f045dd65f6ea4c630250337cc8f718b2'
X-Git-Tag: Release-2010-05/1~8252^2~1^2~4^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=762e232f884a306456ff24b65061ba2c87728413;p=openembedded.git

Merge ... '0a81de11f045dd65f6ea4c630250337cc8f718b2'
     and '0dbb48946ab15c0ee9c232d1a1fc31e5b65037cd'
---

762e232f884a306456ff24b65061ba2c87728413