From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 17 Mar 2007 15:28:44 +0000 (+0000)
Subject: merge of 'bc89338ca2101af77f442deb20adcbb628e64e65'
X-Git-Tag: Release-2010-05/1~8868^2~1034^2~10^2~2^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=834401da186f032815c3730b6d15a707ea4d2dc4;p=openembedded.git

Merge ... 'bc89338ca2101af77f442deb20adcbb628e64e65'
     and 'da190699aa6161c0dab5185e2c86e14537953f1b'
---

834401da186f032815c3730b6d15a707ea4d2dc4