From: Koen Kooi <koen@openembedded.org>
Date: Mon, 1 Jan 2007 18:19:17 +0000 (+0000)
Subject: merge of '5c1ed62467a4b699ec7940179d22e83acf36ad4f'
X-Git-Tag: Release-2010-05/1~9453^2~49
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e757490d49e9cb18ff4114eb44db8207dde827e9;p=openembedded.git

Merge ... '5c1ed62467a4b699ec7940179d22e83acf36ad4f'
     and '7ac3268bfbc5039a8aba9b5db44344ebfaa1f59c'
---

e757490d49e9cb18ff4114eb44db8207dde827e9