From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 3 Jan 2007 06:46:55 +0000 (+0000)
Subject: merge of 'a03b7681c989a843291fbb5bb23b5cd2ab067714'
X-Git-Tag: Release-2010-05/1~9453^2~4^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=655937cf7b747c08b17f0cfeb6390f05e6c82da3;p=openembedded.git

Merge ... 'a03b7681c989a843291fbb5bb23b5cd2ab067714'
     and 'e5f0e1fc961b386324024cff442cfd823afa42ec'
---

655937cf7b747c08b17f0cfeb6390f05e6c82da3