From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 31 Dec 2006 14:02:28 +0000 (+0000)
Subject: merge of 0b937eda3a0ec22f59a9ad6a43602697b57732e9
X-Git-Tag: Release-2010-05/1~9453^2~34^2~1^2~1^2~1^2~1^2^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=433736c2991f6b9e96e7f8c73a6d7e54bb131dda;p=openembedded.git

merge of 0b937eda3a0ec22f59a9ad6a43602697b57732e9
     and 3a7fefb6223f21f3c12059d2ba662968e90e8461
---

433736c2991f6b9e96e7f8c73a6d7e54bb131dda