From: Adrian Davey <ade@beth2.org>
Date: Mon, 16 Jan 2006 16:05:31 +0000 (+0000)
Subject: merge of 11e32f6f530670e04143728af2b7b193a6d33ba2
X-Git-Tag: Release-2010-05/1~9453^2~2638^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5296d0212e55e49fd0afce08751c54b5057a84fa;p=openembedded.git

merge of 11e32f6f530670e04143728af2b7b193a6d33ba2
     and 36b037a423c8b35b017dc3b821094d570ea82d5a
---

5296d0212e55e49fd0afce08751c54b5057a84fa