From: Koen Kooi <koen@openembedded.org>
Date: Sat, 2 Dec 2006 12:24:54 +0000 (+0000)
Subject: merge of '7db6bb945fe2a5fda8aa63a3f14cb88e4f63c7ce'
X-Git-Tag: Release-2010-05/1~9453^2~204^2~39^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06d4c995f7ad6497e55b863e29d6bade1506e590;p=openembedded.git

Merge ... '7db6bb945fe2a5fda8aa63a3f14cb88e4f63c7ce'
     and 'bf07ce72438537e1e952e551bf4bfba3877e3c59'
---

06d4c995f7ad6497e55b863e29d6bade1506e590