From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Mon, 18 Dec 2006 19:48:16 +0000 (+0000)
Subject: merge of '7bdbc64d5f4962d2cca1a7f99fe115d3fcd0aea5'
X-Git-Tag: Release-2010-05/1~9453^2~125^2~24^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99804db1347e375bb3228ae7742b6ca727750052;p=openembedded.git

Merge ... '7bdbc64d5f4962d2cca1a7f99fe115d3fcd0aea5'
     and 'fe7f09c0ab220b629fe9a568245cfe155bbeb443'
---

99804db1347e375bb3228ae7742b6ca727750052