From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Tue, 1 Jan 2008 23:00:11 +0000 (+0000)
Subject: merge of '560f1294e1ef2699d2b80c98d99386c3030b8c0b'
X-Git-Tag: Release-2010-05/1~8050
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e411fc33b72ba7667737f6cf89c2ba04231e0113;p=openembedded.git

Merge ... '560f1294e1ef2699d2b80c98d99386c3030b8c0b'
     and '7dc115a2ce1cbe29ae1b44dad5546d16e4a5e4dd'
---

e411fc33b72ba7667737f6cf89c2ba04231e0113