From: Philip Balister <philip@balister.org>
Date: Thu, 19 Oct 2006 19:18:14 +0000 (+0000)
Subject: merge of '52496b27f127642a3f588c6e210021c39be53fb0'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~92
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f278eee0ffb4a56f560d2f8e654058c7d4d74f0;p=openembedded.git

Merge ... '52496b27f127642a3f588c6e210021c39be53fb0'
     and '5c42ee91051149d61abc8ebbe9ea83a6177443ee'
---

8f278eee0ffb4a56f560d2f8e654058c7d4d74f0