From: Koen Kooi <koen@openembedded.org>
Date: Fri, 13 Oct 2006 14:15:09 +0000 (+0000)
Subject: merge of '348938c3555546469580e952fd705c085456a048'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~201
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5116661aff73a611670fa3f1f052c3e38ce901b;p=openembedded.git

Merge ... '348938c3555546469580e952fd705c085456a048'
     and 'fd7e0b1c50f0c7757052ee02bc3a484be06cad6e'
---

f5116661aff73a611670fa3f1f052c3e38ce901b