From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Mon, 25 Jun 2007 22:49:21 +0000 (+0000)
Subject: merge of '01ba9ef84a43848013480079effda2abb4d3b581'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf5c9e16ff1c80cef8f6fec18653b0ea7ababb58;p=openembedded.git

Merge ... '01ba9ef84a43848013480079effda2abb4d3b581'
     and '7733cf946eb165c244b4967fd9a2e3bf3b801ceb'
---

cf5c9e16ff1c80cef8f6fec18653b0ea7ababb58