From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 31 Aug 2006 06:40:23 +0000 (+0000)
Subject: merge of 00a1173f52521e355938ea94e53256590de6c4c5
X-Git-Tag: Release-2010-05/1~9453^2~875^2~131
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cc16cd7f92bf15156a92d377a6b686b3196afab;p=openembedded.git

merge of 00a1173f52521e355938ea94e53256590de6c4c5
     and 370dc8d1e7ae56009af3c2640733f1c5ea39523d
---

2cc16cd7f92bf15156a92d377a6b686b3196afab