From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 2 Feb 2006 13:30:24 +0000 (+0000)
Subject: merge of 211ee08c16c0bff5c1b6c495d484747ddec7fb0d
X-Git-Tag: Release-2010-05/1~9453^2~2458^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a5a60efdc31bd7fdd76b1c78f153f87febdfccb;p=openembedded.git

merge of 211ee08c16c0bff5c1b6c495d484747ddec7fb0d
     and e35f8ca17cb59e4448784d22e1c01c2f627e970f
---

2a5a60efdc31bd7fdd76b1c78f153f87febdfccb