From: Philip Balister <philip@balister.org>
Date: Wed, 28 Feb 2007 12:24:55 +0000 (+0000)
Subject: merge of '136c87650ffb3c5462d9cde38962c88081eb61d7'
X-Git-Tag: Release-2010-05/1~9133^2~18
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8fcd46c39c1973e9a649e186bf8f85c408d34d6;p=openembedded.git

Merge ... '136c87650ffb3c5462d9cde38962c88081eb61d7'
     and '2db9e92f543145d04b9a161be87e9c34388914e3'
---

b8fcd46c39c1973e9a649e186bf8f85c408d34d6