From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 10 Dec 2007 07:40:44 +0000 (+0000)
Subject: merge of '03302c374666d2f086911b5f8cfdf3fae66c068b'
X-Git-Tag: Release-2010-05/1~8171
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7ccf1dc2e13a6a08ee4a79cde39ad8bdc99a7a7;p=openembedded.git

Merge ... '03302c374666d2f086911b5f8cfdf3fae66c068b'
     and 'bd6b4d5b14f0cabd82c60e4f95201f1cff17e1b0'
---

f7ccf1dc2e13a6a08ee4a79cde39ad8bdc99a7a7