From: Koen Kooi <koen@openembedded.org>
Date: Wed, 13 Dec 2006 22:22:36 +0000 (+0000)
Subject: merge of '1fc9d550468a28c01730e8075da9eb6354279e82'
X-Git-Tag: Release-2010-05/1~9453^2~168
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48785a3b7179e9f3385289d4e15216f4c2e5ed3e;p=openembedded.git

Merge ... '1fc9d550468a28c01730e8075da9eb6354279e82'
     and '7dc5c6145f5a9f64aba3521e24e1a0b1ff7f0e0e'
---

48785a3b7179e9f3385289d4e15216f4c2e5ed3e