From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Wed, 28 Nov 2007 12:14:40 +0000 (+0000)
Subject: merge of 'ce64d96dcf3b268df1bdcd7e945e7188d09c7db8'
X-Git-Tag: Release-2010-05/1~8265^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dff263b991bbfbaa61fb4ca5420af35237516e2d;p=openembedded.git

Merge ... 'ce64d96dcf3b268df1bdcd7e945e7188d09c7db8'
     and 'd521cbe6aca8b81bda5eb51149cea06dd31e1dd2'
---

dff263b991bbfbaa61fb4ca5420af35237516e2d