From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 24 Jan 2006 12:30:18 +0000 (+0000)
Subject: merge of 2e1b97f979cbf150f471cf8ae18f6827f8c81a56
X-Git-Tag: Release-2010-05/1~9453^2~2571
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdb9240b069dca05883d095476d6e830634b3027;p=openembedded.git

merge of 2e1b97f979cbf150f471cf8ae18f6827f8c81a56
     and effe6a45a7382be0e9b737ba3d9d9a631e949577
---

bdb9240b069dca05883d095476d6e830634b3027