From: Phil Blundell <philb@gnu.org>
Date: Sun, 28 Jan 2007 16:14:43 +0000 (+0000)
Subject: merge of '7a32604865cb7ad63fbc7f14acda9e02229b44b5'
X-Git-Tag: Release-2010-05/1~9332
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25fd37ef987368dd32eba359273c5af98158a364;p=openembedded.git

Merge ... '7a32604865cb7ad63fbc7f14acda9e02229b44b5'
     and '9ab9482d0ea26dbc9267d10e1eb42cc1a7546b6b'
---

25fd37ef987368dd32eba359273c5af98158a364