From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 19 Aug 2006 15:31:19 +0000 (+0000)
Subject: merge of 421037e116a3cd31a03fb28c244cee440f2a612c
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41a73425e81eb7325b1dd8d27b60968e63b0cf1b;p=openembedded.git

merge of 421037e116a3cd31a03fb28c244cee440f2a612c
     and 5ea9eb6f097fe0b646889d1b3a1312d9d7fc796e
---

41a73425e81eb7325b1dd8d27b60968e63b0cf1b