From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Wed, 6 Feb 2008 16:38:16 +0000 (+0000)
Subject: merge of '3096507e1176a6f381be085273c56ec4c8587ec8'
X-Git-Tag: Release-2010-05/1~7713^2~41^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b7fb667944736d86e8b483727f87998083e8972;p=openembedded.git

Merge ... '3096507e1176a6f381be085273c56ec4c8587ec8'
     and 'a86b893a92c8dbd634262771afe20a8eb26f2b82'
---

1b7fb667944736d86e8b483727f87998083e8972