From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 20 Nov 2006 14:34:03 +0000 (+0000)
Subject: merge of '20512a86807847c46b89aa3589332b9d24cd6502'
X-Git-Tag: Release-2010-05/1~9453^2~398
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5acf6b0ab977d9eeb93a6f6402f28c12645474d;p=openembedded.git

Merge ... '20512a86807847c46b89aa3589332b9d24cd6502'
     and 'd6303c5e818fd02ef51ffd8057190cb2a110bc74'
---

d5acf6b0ab977d9eeb93a6f6402f28c12645474d