From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Thu, 27 Dec 2007 23:28:55 +0000 (+0000)
Subject: merge of 'adce0d7b339a936c3f4417e986f731cddd2d5ff7'
X-Git-Tag: Release-2010-05/1~8072
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32e96f5054187768c116c9b6b4336cfb3cb27826;p=openembedded.git

Merge ... 'adce0d7b339a936c3f4417e986f731cddd2d5ff7'
     and 'f3e47f941b50235fe57c645fb3dd590a67411ea0'
---

32e96f5054187768c116c9b6b4336cfb3cb27826