From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 8 Feb 2006 21:16:52 +0000 (+0000)
Subject: merge of 3b1e5467e63df0caf15791330cc41c5557e0eedd
X-Git-Tag: Release-2010-05/1~9453^2~2389
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90a1a74ec22b1b1c6a29ab14b8fb37334939be59;p=openembedded.git

merge of 3b1e5467e63df0caf15791330cc41c5557e0eedd
     and 81310a82efd8fa4b4ce7bd707ed734f3ce153c46
---

90a1a74ec22b1b1c6a29ab14b8fb37334939be59