From: Philip Balister <philip@balister.org>
Date: Sun, 26 Aug 2007 13:46:41 +0000 (+0000)
Subject: merge of '046d6d9432d8b2f9c1768927b44311f32da334f0'
X-Git-Tag: Release-2010-05/1~8789^2~23
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67b83dfec937e94df5d593825f5ac56d9afefcac;p=openembedded.git

Merge ... '046d6d9432d8b2f9c1768927b44311f32da334f0'
     and '641c0ed5d9b91d2a89f0918ddfbd5c0a67eee6a9'
---

67b83dfec937e94df5d593825f5ac56d9afefcac