From: Koen Kooi <koen@openembedded.org>
Date: Thu, 21 Dec 2006 21:44:02 +0000 (+0000)
Subject: merge of '0a670ad135de80006479fae559372bd4a2a6953e'
X-Git-Tag: Release-2010-05/1~9453^2~129
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12c72683f4c3cfd9cf1669ff81ca95ecdd84dc02;p=openembedded.git

Merge ... '0a670ad135de80006479fae559372bd4a2a6953e'
     and '850dbef2977c53c7f819381ceb94ff469adaddc8'
---

12c72683f4c3cfd9cf1669ff81ca95ecdd84dc02