From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Thu, 5 Jul 2007 00:34:12 +0000 (+0000)
Subject: merge of '6f99be19e645cdee7ca3a6e76af76764e4c2140c'
X-Git-Tag: Release-2010-05/1~8868^2~216^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a678820b7afaf0b93cd8949c689112bd723e755c;p=openembedded.git

Merge ... '6f99be19e645cdee7ca3a6e76af76764e4c2140c'
     and 'f2bd31f1aaf84bef9625b425a458bc019b97a434'
---

a678820b7afaf0b93cd8949c689112bd723e755c