From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 8 Sep 2006 11:46:14 +0000 (+0000)
Subject: merge of e456e0a150e36bfe28fe9301fd0c8286fbb0073b
X-Git-Tag: Release-2010-05/1~9453^2~876^2~12^2~1^2~1^2^2^2~1^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec7bc9bda9952240e8d04e97630b4877fd6c9563;p=openembedded.git

merge of e456e0a150e36bfe28fe9301fd0c8286fbb0073b
     and e8151982a696cd92a6f4a1f65d8907778bf60836
---

ec7bc9bda9952240e8d04e97630b4877fd6c9563