From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sun, 13 Jan 2008 11:48:59 +0000 (+0000)
Subject: merge of '06c65f7df2a61bcad082ca5110a1c949ac902ae4'
X-Git-Tag: Release-2010-05/1~7951
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d67ad394e61145d1ec4a1ac7e85e24a86055b3e;p=openembedded.git

Merge ... '06c65f7df2a61bcad082ca5110a1c949ac902ae4'
     and '37c39841f1cbbf2ca651ce71ff495b7bda859ae5'
---

3d67ad394e61145d1ec4a1ac7e85e24a86055b3e