From: Koen Kooi <koen@openembedded.org>
Date: Wed, 17 Oct 2007 17:25:20 +0000 (+0000)
Subject: merge of '1065bf1f2e7b3927eac115451e22f3a6cdb43ec2'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14120404ccd232f3819cde88ddd637c9b3110d9e;p=openembedded.git

Merge ... '1065bf1f2e7b3927eac115451e22f3a6cdb43ec2'
     and 'ce6e70caf14f47e77ee67c3e73490db4ade16767'
---

14120404ccd232f3819cde88ddd637c9b3110d9e