From: Koen Kooi <koen@openembedded.org>
Date: Thu, 19 Oct 2006 11:38:08 +0000 (+0000)
Subject: merge of 'a6f1d179d5b142243bfd53363872c06f4207c8da'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~96^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3dab540228d7c6a944252d6dfd3223e0eea40029;p=openembedded.git

Merge ... 'a6f1d179d5b142243bfd53363872c06f4207c8da'
     and 'ccbf52e8ded1b509f617e8d8e81fd0b4045bcff7'
---

3dab540228d7c6a944252d6dfd3223e0eea40029