From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Fri, 7 Dec 2007 11:24:32 +0000 (+0000)
Subject: merge of '23d887e2d2e50dec327486756c223c4dbbd10f70'
X-Git-Tag: Release-2010-05/1~8180^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a40fc23546fc6d537c36e92bf1baa06e42ef3e6a;p=openembedded.git

Merge ... '23d887e2d2e50dec327486756c223c4dbbd10f70'
     and 'f9718212cc877376dcd4cf9ffaf6991c4522d628'
---

a40fc23546fc6d537c36e92bf1baa06e42ef3e6a