From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 15 Mar 2007 10:31:45 +0000 (+0000)
Subject: merge of '5dae50ef93c98e8d9c77991af158e433d8152857'
X-Git-Tag: Release-2010-05/1~8868^2~1086^2^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3df43088eb72e4e4d58520bd4cd8d48f808c8da4;p=openembedded.git

Merge ... '5dae50ef93c98e8d9c77991af158e433d8152857'
     and 'ce3a8bd725cc6305cd8cd40afb1dce0231d74ebd'
---

3df43088eb72e4e4d58520bd4cd8d48f808c8da4