From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Sun, 9 Mar 2008 21:09:56 +0000 (+0000)
Subject: merge of '13126e3c4c86326c68fc0b5dc3b7bcadd544ea20'
X-Git-Tag: Release-2010-05/1~7515
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=962778bb4a82cf4e251c304c50229dd40eb33878;p=openembedded.git

Merge ... '13126e3c4c86326c68fc0b5dc3b7bcadd544ea20'
     and 'e3bce18db3557d05994587f4a53578acbc1f3792'
---

962778bb4a82cf4e251c304c50229dd40eb33878