From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 8 Jan 2006 00:15:40 +0000 (+0000)
Subject: merge of 47dce11edfa131d098408e653487b0f793394e95
X-Git-Tag: Release-2010-05/1~9453^2~2707^2^2~11^2^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2f9caadc01843d18f567cb85d072d1002b7fcb5;p=openembedded.git

merge of 47dce11edfa131d098408e653487b0f793394e95
     and 76db664e471ff075c7d6410d2cae0e1bdc9b1178
---

f2f9caadc01843d18f567cb85d072d1002b7fcb5