From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 25 Apr 2006 20:34:35 +0000 (+0000)
Subject: merge of 73a458a7f5d306cf25469186c7ca277895c5e2b2
X-Git-Tag: Release-2010-05/1~9453^2~1808
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cb8c8eb102bd6a3194ff5eb0cc00a855cd98573;p=openembedded.git

merge of 73a458a7f5d306cf25469186c7ca277895c5e2b2
     and b45333304fdefa7fde471e8d3b251f8557ffb146
---

5cb8c8eb102bd6a3194ff5eb0cc00a855cd98573