From: Philip Balister <philip@balister.org>
Date: Sun, 23 Sep 2007 18:56:53 +0000 (+0000)
Subject: merge of '54a5d8fb4d7a6a20f8dd77f12f48946c8af71061'
X-Git-Tag: Release-2010-05/1~8620^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6eaa762269d1e9a7428833af8ed2cc5ac8411b02;p=openembedded.git

Merge ... '54a5d8fb4d7a6a20f8dd77f12f48946c8af71061'
     and '7b5746140aa364c513fc814efde39c90df31234e'
---

6eaa762269d1e9a7428833af8ed2cc5ac8411b02