From: Koen Kooi <koen@openembedded.org>
Date: Wed, 16 May 2007 10:58:08 +0000 (+0000)
Subject: merge of '1c4ee14296c98438edf9aebdbe655db562583e52'
X-Git-Tag: Release-2010-05/1~8868^2~486
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15f974e4595881a1f308a00e27184be450ca1f4a;p=openembedded.git

Merge ... '1c4ee14296c98438edf9aebdbe655db562583e52'
     and '6f56c7d82482d2097d9668c7a97af22ea3e644b8'
---

15f974e4595881a1f308a00e27184be450ca1f4a