From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 28 Feb 2008 00:53:50 +0000 (+0000)
Subject: merge of '630bb2aaaac174b3d70399ff3fc6fb3a647d53dd'
X-Git-Tag: Release-2010-05/1~7572^2~60^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58c4c1107404f0a7451a475fb6dad76ec8ee7c3c;p=openembedded.git

Merge ... '630bb2aaaac174b3d70399ff3fc6fb3a647d53dd'
     and 'ccc4dd4681cb7f6f34e0ac18322caee291ded94b'
---

58c4c1107404f0a7451a475fb6dad76ec8ee7c3c