From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 19 Aug 2006 18:01:08 +0000 (+0000)
Subject: merge of a0f14f1eefe4a650f8095ac1b70dcdd9c1e2e16c
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2~1^2^2~5^2^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2660a7498f9f59a126bcdd0b5d4ee5c73cc564b4;p=openembedded.git

merge of a0f14f1eefe4a650f8095ac1b70dcdd9c1e2e16c
     and bb54c56849b9b51c3c909bc68b84a54c36466514
---

2660a7498f9f59a126bcdd0b5d4ee5c73cc564b4