From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Fri, 7 Sep 2007 12:52:22 +0000 (+0000)
Subject: merge of '25a24c2d758b820a0edde364e9cc5c7910fa9e70'
X-Git-Tag: Release-2010-05/1~8708
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=476005cf505c4b2364c73b914f092650dc36141a;p=openembedded.git

Merge ... '25a24c2d758b820a0edde364e9cc5c7910fa9e70'
     and 'f545cd8147e32d6a2cba3afc541559b47a88c272'
---

476005cf505c4b2364c73b914f092650dc36141a