From: Philip Balister <philip@balister.org>
Date: Wed, 30 Aug 2006 21:53:59 +0000 (+0000)
Subject: merge of '8605731b4522785b2e02d610d5eb7f491cffad2d'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~132
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8b9e3d8acf294a0a06ff93e5711007e938efa71;p=openembedded.git

Merge ... '8605731b4522785b2e02d610d5eb7f491cffad2d'
     and 'e9ef89a380af1f7a8f347ac37b13679dc9dfe7b5'
---

d8b9e3d8acf294a0a06ff93e5711007e938efa71