From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 10 Nov 2006 04:23:06 +0000 (+0000)
Subject: merge of 858ba3bee7e4e7c81ebcd7001192498cb2585923
X-Git-Tag: Release-2010-05/1~9453^2~481^2~3^2~23
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b17c95b89304d47d7b21474dbc21f66a44fe5c4;p=openembedded.git

merge of 858ba3bee7e4e7c81ebcd7001192498cb2585923
     and fce83af6d32103c8a36512cca53b8403f3f03600
---

2b17c95b89304d47d7b21474dbc21f66a44fe5c4