From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 28 Apr 2006 21:40:11 +0000 (+0000)
Subject: merge of 608d58e1665f9ad5851aebd539e2ab73ff70fa54
X-Git-Tag: Release-2010-05/1~9453^2~1751^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=160b95085028e602a8469d02d71140c798e773a3;p=openembedded.git

merge of 608d58e1665f9ad5851aebd539e2ab73ff70fa54
     and 60ed4023d76ee23e593805e751d227e788d38682
---

160b95085028e602a8469d02d71140c798e773a3