From: Mike Westerhof <mwester@dls.net>
Date: Tue, 16 Oct 2007 15:26:36 +0000 (+0000)
Subject: merge of '46876c0e449d95a41520ddd3b4b694e1d919dd4b'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~36^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc98c523c185876133323707600c9cc2b004ad2d;p=openembedded.git

Merge ... '46876c0e449d95a41520ddd3b4b694e1d919dd4b'
     and 'afda8aa11a73621c3822525abaf21bc2c4b73ab7'
---

cc98c523c185876133323707600c9cc2b004ad2d