From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Sun, 20 May 2007 18:16:25 +0000 (+0000)
Subject: merge of '13698b0155bfd84de4053760ea89c710016962d0'
X-Git-Tag: Release-2010-05/1~8868^2~420
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba117dfb404163d42a6782b4fbe041a70e0a0af9;p=openembedded.git

Merge ... '13698b0155bfd84de4053760ea89c710016962d0'
     and 'f929edf173e963f92fadb3e8400f60f5254de752'
---

ba117dfb404163d42a6782b4fbe041a70e0a0af9