From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 10 Feb 2008 00:09:59 +0000 (+0000)
Subject: merge of 'a6109edcbd4aec5e8bb368261b02f11ccc0e0a62'
X-Git-Tag: Release-2010-05/1~7696^2~11^2~13^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b39dc8d708431b8316a7d0974a3e5c6a7bedec6;p=openembedded.git

Merge ... 'a6109edcbd4aec5e8bb368261b02f11ccc0e0a62'
     and 'db2b97c9756f9fee0b72ffe7725a8db0da899833'
---

2b39dc8d708431b8316a7d0974a3e5c6a7bedec6