From: Koen Kooi <koen@openembedded.org>
Date: Thu, 7 Dec 2006 12:52:33 +0000 (+0000)
Subject: merge of '17c261d19b8358762e0eb5cbbc9a4cc29c9e63bc'
X-Git-Tag: Release-2010-05/1~9453^2~194
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bb7a436dd2785f792947d5d815249688901ea03;p=openembedded.git

Merge ... '17c261d19b8358762e0eb5cbbc9a4cc29c9e63bc'
     and '7c038075995ee701b14136f3a37c2f0635040891'
---

2bb7a436dd2785f792947d5d815249688901ea03