From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Tue, 26 Jun 2007 17:18:21 +0000 (+0000)
Subject: merge of '96bd64db32828367264800d1cfdf956eff85cb26'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~20^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e7e4d1bae5f50e7bf02ee1105fac3ff2c782dc7;p=openembedded.git

Merge ... '96bd64db32828367264800d1cfdf956eff85cb26'
     and 'f0486ab90d9bcee9358419983d8574f60fbf94af'
---

2e7e4d1bae5f50e7bf02ee1105fac3ff2c782dc7