From: Koen Kooi <koen@openembedded.org>
Date: Wed, 10 Oct 2007 09:41:40 +0000 (+0000)
Subject: merge of '313f55e5f9f09b07e1ed5f50011e51c1c6acb73c'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~104
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7b4ec5d9d0f4ea27981de069b60a4c5b2152195;p=openembedded.git

Merge ... '313f55e5f9f09b07e1ed5f50011e51c1c6acb73c'
     and 'dbb53fe45696a4f12d4e96c449c65f691e0e8346'
---

c7b4ec5d9d0f4ea27981de069b60a4c5b2152195