From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 19 Dec 2007 04:32:45 +0000 (+0000)
Subject: merge of '5968fdd70fe297abea7dae6b5ada03014e1c4e37'
X-Git-Tag: Release-2010-05/1~8136^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86bd77d66706b8886e174096e95eda2f52ac0676;p=openembedded.git

Merge ... '5968fdd70fe297abea7dae6b5ada03014e1c4e37'
     and 'fd6d7fdcf42f73a52d23dc4567ab3431df491150'
---

86bd77d66706b8886e174096e95eda2f52ac0676