From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 10 Jul 2007 14:30:46 +0000 (+0000)
Subject: merge of '25a1b52e92703197872289b2993d3a00ab8ef3a3'
X-Git-Tag: Release-2010-05/1~8868^2~176^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de1ecaba75bda10cc12d638542ec8df695a8d9bf;p=openembedded.git

Merge ... '25a1b52e92703197872289b2993d3a00ab8ef3a3'
     and 'e83627c34a3570756ff549f9e7273f5bea3e57bf'
---

de1ecaba75bda10cc12d638542ec8df695a8d9bf