From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 7 Sep 2006 12:46:21 +0000 (+0000)
Subject: merge of 03a7d68c3436f6a990749305cdd36942d734f471
X-Git-Tag: Release-2010-05/1~9453^2~876^2~12^2~1^2~1^2^2^2~1^2^2~1^2^2^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=814fdf36dfee441826456c908658bd94341b018e;p=openembedded.git

merge of 03a7d68c3436f6a990749305cdd36942d734f471
     and 97aa85608cddac7f5307ba3e1f9c299b20bbf014
---

814fdf36dfee441826456c908658bd94341b018e