From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 19 Dec 2006 20:17:55 +0000 (+0000)
Subject: merge of c69a04fa4369e6963714045da040dac56fc4b2da
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2^2~2^2~2^2~6^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5381982c962def27c83adccedaeb7db6d01898e;p=openembedded.git

merge of c69a04fa4369e6963714045da040dac56fc4b2da
     and f8bb378547e28134ff644fa1287e35dc493f12de
---

e5381982c962def27c83adccedaeb7db6d01898e