From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Thu, 24 Jan 2008 14:16:53 +0000 (+0000)
Subject: merge of '5c04010dc0ca86da15eacb212b5845c24d73eb1e'
X-Git-Tag: Release-2010-05/1~7838^2~12^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62d4698b651ec93b84dcb2f04fffdbd2b420f103;p=openembedded.git

Merge ... '5c04010dc0ca86da15eacb212b5845c24d73eb1e'
     and 'b530b781e2597a57e49d9d02d956a75f0617c9a8'
---

62d4698b651ec93b84dcb2f04fffdbd2b420f103