From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 10 Mar 2007 19:21:49 +0000 (+0000)
Subject: merge of '2e36446703200c483d26de29cbaa4a5269fbc5a6'
X-Git-Tag: Release-2010-05/1~8868^2~1110^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b675de4fb39c23baf23f58b91f4d58e5aeae674;p=openembedded.git

Merge ... '2e36446703200c483d26de29cbaa4a5269fbc5a6'
     and '32536525315e3cb31c5dd980b055f0ecb13acead'
---

9b675de4fb39c23baf23f58b91f4d58e5aeae674