From: Koen Kooi <koen@openembedded.org>
Date: Mon, 31 Jul 2006 11:46:42 +0000 (+0000)
Subject: merge of 'acd8498e4573491722380c035bd7b58de78410ee'
X-Git-Tag: Release-2010-05/1~9453^2~1041
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09436056f94e7103d436177bdaea7c3bd9493913;p=openembedded.git

Merge ... 'acd8498e4573491722380c035bd7b58de78410ee'
     and 'd7cc6ec7ff432b7592af0d14fbe1777a3bebd543'
---

09436056f94e7103d436177bdaea7c3bd9493913