From: Koen Kooi <koen@openembedded.org>
Date: Tue, 14 Nov 2006 10:07:42 +0000 (+0000)
Subject: merge of '2001ac2acd66ae1b7566b3830724007b6854f03f'
X-Git-Tag: Release-2010-05/1~9453^2~513
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=549ff14829822f4cbb415bd7b49c4af9b52bfc7b;p=openembedded.git

Merge ... '2001ac2acd66ae1b7566b3830724007b6854f03f'
     and 'a6961e05d6a31b23961267e50853355f41ab5891'
---

549ff14829822f4cbb415bd7b49c4af9b52bfc7b