From: Philip Balister <philip@balister.org>
Date: Wed, 8 Aug 2007 23:08:32 +0000 (+0000)
Subject: merge of '122762c7f94c2245c6d7d2b16bc8ae60ba8edab2'
X-Git-Tag: Release-2010-05/1~9084^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c512d6f768199951cc7e0b97576761a0700776e;p=openembedded.git

Merge ... '122762c7f94c2245c6d7d2b16bc8ae60ba8edab2'
     and '36843ed17320bc85c468fd1b0c75b2458b55b8ac'
---

1c512d6f768199951cc7e0b97576761a0700776e