From: Philip Balister <philip@balister.org>
Date: Fri, 3 Aug 2007 14:31:39 +0000 (+0000)
Subject: merge of '4bbce1b1f23b34445cc85ab8c7fa08737f26602a'
X-Git-Tag: Release-2010-05/1~8868^2~28^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a68cbf6ac6adef85249583802ac1e0422aa2e66;p=openembedded.git

Merge ... '4bbce1b1f23b34445cc85ab8c7fa08737f26602a'
     and '582846d2ab5b93f2ea68455a2d13d90c4ca2fe12'
---

0a68cbf6ac6adef85249583802ac1e0422aa2e66