From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 25 Apr 2006 20:40:50 +0000 (+0000)
Subject: merge of 7407af57a0190a57119bdc083f162292bfc7e411
X-Git-Tag: Release-2010-05/1~9453^2~1807
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=602f6ce52feb179a83a945b7f2dc82736e92d922;p=openembedded.git

merge of 7407af57a0190a57119bdc083f162292bfc7e411
     and c032f363b900b2e705a80a784c2bd7eb7c7d6549
---

602f6ce52feb179a83a945b7f2dc82736e92d922