From: Koen Kooi <koen@openembedded.org>
Date: Wed, 23 Aug 2006 12:34:41 +0000 (+0000)
Subject: merge of '34f1a5cd503f1c1aef18d4468fb112306166c499'
X-Git-Tag: Release-2010-05/1~9453^2~911^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cb647d149cac7d65031fd4d95d19aa88d445045;p=openembedded.git

Merge ... '34f1a5cd503f1c1aef18d4468fb112306166c499'
     and 'd3b7dd0f986647b0949b0f10ae6b633653a05bde'
---

2cb647d149cac7d65031fd4d95d19aa88d445045