From: Philip Balister <philip@balister.org>
Date: Mon, 20 Aug 2007 19:00:03 +0000 (+0000)
Subject: merge of '95a513be8426c7ab7565ce3120697b9f88ce67c0'
X-Git-Tag: Release-2010-05/1~8867
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd09e1bf4756dd8000a42ae21a41ae2f69da485e;p=openembedded.git

Merge ... '95a513be8426c7ab7565ce3120697b9f88ce67c0'
     and 'a4bed52e2d6c695d814b53319f20101071ca9bff'
---

cd09e1bf4756dd8000a42ae21a41ae2f69da485e