From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Thu, 20 Dec 2007 22:12:12 +0000 (+0000)
Subject: merge of '848e56fa546fe4f9defbbca37a6baee4fab0c6fc'
X-Git-Tag: Release-2010-05/1~8125
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6150944b250086c0375b86ce819a8b9bf9d2820;p=openembedded.git

Merge ... '848e56fa546fe4f9defbbca37a6baee4fab0c6fc'
     and 'b0214fe2d462308558a4fdd18ac2097bc53e51b2'
---

c6150944b250086c0375b86ce819a8b9bf9d2820