From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 14 Aug 2006 18:46:33 +0000 (+0000)
Subject: merge of 0fb74741994c40f954b3aef2f855c14636c49ccb
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^2^2~5^2^2~4^2^2~2^2^2^2~2^2~1^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a09278bd4571e2c4b8217bd3e5aa5fdb3ec9f93d;p=openembedded.git

merge of 0fb74741994c40f954b3aef2f855c14636c49ccb
     and 4052297c94828dc52bc0def5a0e710c9ac0d5446
---

a09278bd4571e2c4b8217bd3e5aa5fdb3ec9f93d