From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 24 Aug 2006 18:46:30 +0000 (+0000)
Subject: merge of 9c3e6a9f0fc6dee68b82fa2b756b3a4f8b10c1d8
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5738374965d3656dcc2003ea4302d83293bf314d;p=openembedded.git

merge of 9c3e6a9f0fc6dee68b82fa2b756b3a4f8b10c1d8
     and b7a9cc9b6dbc352e0d4650054077abb3b118a5e8
---

5738374965d3656dcc2003ea4302d83293bf314d