From: Philip Balister <philip@balister.org>
Date: Mon, 16 Oct 2006 19:47:10 +0000 (+0000)
Subject: merge of '7d7875c629a2b57f8e7e29f88aeb9ecbbb1026ab'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~146^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f7421ef4e94e282db7a2d1394cacbc9a1eea64f;p=openembedded.git

Merge ... '7d7875c629a2b57f8e7e29f88aeb9ecbbb1026ab'
     and '90c0d1e23e59f819957f649fdc8206b38c3c8a54'
---

3f7421ef4e94e282db7a2d1394cacbc9a1eea64f