From: Koen Kooi <koen@openembedded.org>
Date: Wed, 26 Jul 2006 16:05:19 +0000 (+0000)
Subject: merge of '04e7fd23b654ca78723da82bfeaf289b3d013aae'
X-Git-Tag: Release-2010-05/1~9453^2~1110
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89b5272c5f627859ba5fc45ad5d0c21cfef84373;p=openembedded.git

Merge ... '04e7fd23b654ca78723da82bfeaf289b3d013aae'
     and '8799855818ba7f133d8510597a9131212edb14a8'
---

89b5272c5f627859ba5fc45ad5d0c21cfef84373