From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 18 Aug 2007 12:52:06 +0000 (+0000)
Subject: merge of '683035d547a30c5f79f681170ee31566e22d5ed6'
X-Git-Tag: Release-2010-05/1~8921
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a639ad1913a57b05b18134492d7a6d5cb9309a8;p=openembedded.git

Merge ... '683035d547a30c5f79f681170ee31566e22d5ed6'
     and '9ff0f129c558fe9930febe6662f830fa9069d3b4'
---

7a639ad1913a57b05b18134492d7a6d5cb9309a8