From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 19 Feb 2007 12:32:54 +0000 (+0000)
Subject: merge of '635d3a2471165977b7c08b84e9174108c404c6a1'
X-Git-Tag: Release-2010-05/1~9163^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26cf88c76c2e3d4e71266068ce2314af9c2c3c0d;p=openembedded.git

Merge ... '635d3a2471165977b7c08b84e9174108c404c6a1'
     and '9148d2b8d041bbdbb9d9cbfa12c0c385ed6f0c7b'
---

26cf88c76c2e3d4e71266068ce2314af9c2c3c0d