From: Koen Kooi <koen@openembedded.org>
Date: Fri, 14 Mar 2008 11:48:39 +0000 (+0000)
Subject: merge of '7cea498c89cd9f4506bd1ed4ce852d868e4e299f'
X-Git-Tag: Release-2010-05/1~7485
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=021639e725c8575eb496459c072878385dc02de8;p=openembedded.git

Merge ... '7cea498c89cd9f4506bd1ed4ce852d868e4e299f'
     and '8ee8043c51d4de884f7d0da4c909abebb6e6356f'
---

021639e725c8575eb496459c072878385dc02de8