From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 17 Aug 2006 19:01:13 +0000 (+0000)
Subject: merge of 78ac43a97074680a24ff21ee7ab0d021a45b0dc1
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2~1^2^2~5^2^2^2~2^2^2~5^2^2~4^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72df83c4f3de870f153ad80369e3f48e71a39058;p=openembedded.git

merge of 78ac43a97074680a24ff21ee7ab0d021a45b0dc1
     and dad791031823a7a2c2ac86617c877ccc040406c9
---

72df83c4f3de870f153ad80369e3f48e71a39058