From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 2 Jul 2005 08:32:03 +0000 (+0000)
Subject: merge of c351a21c44ec49f4848614ef97f23d6d69f93a15
X-Git-Tag: Release-2010-05/1~9453^2~4256
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b87b907d9a14d0badd6c8d65b945306b66c5e4a1;p=openembedded.git

merge of c351a21c44ec49f4848614ef97f23d6d69f93a15
     and db6c2c937cf31ea87f4a78972b6063d545212c44
---

b87b907d9a14d0badd6c8d65b945306b66c5e4a1