From: Koen Kooi <koen@openembedded.org>
Date: Tue, 12 Dec 2006 20:27:47 +0000 (+0000)
Subject: merge of '45fb4fa94d52a65c3a3fa636c6122139173dfa8d'
X-Git-Tag: Release-2010-05/1~9453^2~171
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44fd0a5b1ae5367de691e3437ae9832d800c22e7;p=openembedded.git

Merge ... '45fb4fa94d52a65c3a3fa636c6122139173dfa8d'
     and 'aa6010d679e0e80d63f4e63191b66e5759482858'
---

44fd0a5b1ae5367de691e3437ae9832d800c22e7