From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 23 Feb 2006 03:11:17 +0000 (+0000)
Subject: merge of 0746766217f478c6eebca71d9f28cc011b491563
X-Git-Tag: Release-2010-05/1~9453^2~2304^2~77
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cb8d519d298d8159d3702ea62e5653733bee64d;p=openembedded.git

merge of 0746766217f478c6eebca71d9f28cc011b491563
     and b8f599588572f86c26bb5cdfa1f5e89c83967e8c
---

1cb8d519d298d8159d3702ea62e5653733bee64d