From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 25 Dec 2006 22:08:11 +0000 (+0000)
Subject: merge of 69397d319e2521a5695b757ce8d4759abc651806
X-Git-Tag: Release-2010-05/1~9453^2~27^2~7^2~1^2^2^2~3^2~1^2~1^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=813a6ae2f4e5c8d0d02f9b35466257aa264e1002;p=openembedded.git

merge of 69397d319e2521a5695b757ce8d4759abc651806
     and 7a9c6dcd00355e7f104559fd3a74974aad0d5967
---

813a6ae2f4e5c8d0d02f9b35466257aa264e1002