From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Mon, 22 Jan 2007 05:13:06 +0000 (+0000)
Subject: merge of '2c6aa2683a665c2762856be4d83ad176bdc97aaf'
X-Git-Tag: Release-2010-05/1~9352^2~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a395815112226458111aa55d6f1ab2d4de4ab6c;p=openembedded.git

Merge ... '2c6aa2683a665c2762856be4d83ad176bdc97aaf'
     and '7057f1a32e0c40ec600851527ca7735abf4dcc62'
---

0a395815112226458111aa55d6f1ab2d4de4ab6c