From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 17 Feb 2007 23:41:39 +0000 (+0000)
Subject: merge of '16171ae55790573667b9c030c80a790d123e19bf'
X-Git-Tag: Release-2010-05/1~9232
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f423928298938b2b053cc80b68fd93d21fe614bf;p=openembedded.git

Merge ... '16171ae55790573667b9c030c80a790d123e19bf'
     and 'cc76392ac5a7b1ccde5981fd2e02094b88a5240a'
---

f423928298938b2b053cc80b68fd93d21fe614bf