From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 25 Aug 2006 09:01:27 +0000 (+0000)
Subject: merge of 471aad48b7c9a627b8076ae84d8c14cdd7fcc175
X-Git-Tag: Release-2010-05/1~9453^2~878^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81b14bec154e7428a4fd4b6e5ca8b289d246bc76;p=openembedded.git

merge of 471aad48b7c9a627b8076ae84d8c14cdd7fcc175
     and 68d89a8d9ec1d1dadd54f2a464845b5134d27796
---

81b14bec154e7428a4fd4b6e5ca8b289d246bc76