From: Philip Balister <philip@balister.org>
Date: Tue, 2 Jan 2007 22:05:49 +0000 (+0000)
Subject: merge of '155f936fb623fd266abcbacae678f48bbbecc4ab'
X-Git-Tag: Release-2010-05/1~9453^2~32
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ab27b7e5239c2837dfa0b87cb15dcf6fdba4be2;p=openembedded.git

Merge ... '155f936fb623fd266abcbacae678f48bbbecc4ab'
     and 'f3d1266d2f4720b12cbb374f4f9fea9b58b0e6aa'
---

6ab27b7e5239c2837dfa0b87cb15dcf6fdba4be2