From: Shane Volpe <shanevolpe@gmail.com>
Date: Thu, 1 Mar 2007 12:35:21 +0000 (+0000)
Subject: merge of '641bec5d8beae1ce2cde958c66c0f0c2ff6fca3b'
X-Git-Tag: Release-2010-05/1~9131
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cdb9192c1460aabfbb7fea40912820461377bca;p=openembedded.git

Merge ... '641bec5d8beae1ce2cde958c66c0f0c2ff6fca3b'
     and '74bce808f5f1a4ca4057310fecab5c639f0cb246'
---

5cdb9192c1460aabfbb7fea40912820461377bca