From: Philip Balister <philip@balister.org>
Date: Thu, 19 Oct 2006 11:53:06 +0000 (+0000)
Subject: merge of '25cf9221b246d0e12058653e95979f1aafb0c667'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~96
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc9ddec4d97dc1713fdfe2b25ef8a09d6d240882;p=openembedded.git

Merge ... '25cf9221b246d0e12058653e95979f1aafb0c667'
     and 'c0e837e430f4657c8d87ba97e9d15210941eecbf'
---

fc9ddec4d97dc1713fdfe2b25ef8a09d6d240882