From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 20 Jun 2007 12:14:55 +0000 (+0000)
Subject: merge of '21c10a8f6d8fab5386df94e29b38d5428ca259bb'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~34^2~2^2~5^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2653d523e374ba1d5a46c84599fcd880a4c6fac;p=openembedded.git

Merge ... '21c10a8f6d8fab5386df94e29b38d5428ca259bb'
     and '9fbb7d1ceaba35be921b769ec7d9551c6629d61c'
---

b2653d523e374ba1d5a46c84599fcd880a4c6fac