From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 26 Oct 2006 00:14:55 +0000 (+0000)
Subject: merge of '70ce29b385336e849086126b404655b06425352b'
X-Git-Tag: Release-2010-05/1~9453^2~571
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=529911a67e564b4c8ff9580e2ca0d5e85b638671;p=openembedded.git

Merge ... '70ce29b385336e849086126b404655b06425352b'
     and 'cdc680936697f38f1dd48f21ad2c10f1016cc3e8'
---

529911a67e564b4c8ff9580e2ca0d5e85b638671