From: Koen Kooi <koen@openembedded.org>
Date: Fri, 29 Sep 2006 20:51:24 +0000 (+0000)
Subject: merge of '5d78367052376f9cb5cf1254ebd88c2b1a03a2e7'
X-Git-Tag: Release-2010-05/1~9453^2~666^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae3df8736aa5aa88b9c7d7f52f2265bf1fb24ef8;p=openembedded.git

Merge ... '5d78367052376f9cb5cf1254ebd88c2b1a03a2e7'
     and 'ab8a258812c46a5d12ee3f0b5fc0de34ecc26d38'
---

ae3df8736aa5aa88b9c7d7f52f2265bf1fb24ef8