From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 8 Feb 2006 20:46:36 +0000 (+0000)
Subject: merge of 376552a598ef9a388d419ca16b2aa113cd923ffa
X-Git-Tag: Release-2010-05/1~9453^2~2382^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=923e4a811754c19101be911843ede1e5e7c6a19e;p=openembedded.git

merge of 376552a598ef9a388d419ca16b2aa113cd923ffa
     and 4af8f96da30c305dfbb250541de315cdfc0e5ec1
---

923e4a811754c19101be911843ede1e5e7c6a19e