From: Philip Balister <philip@balister.org>
Date: Mon, 22 Jan 2007 23:25:11 +0000 (+0000)
Subject: merge of '6a884c524b47bc199d7c8fb08262ba476bc25c13'
X-Git-Tag: Release-2010-05/1~9352^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c96ddb61ffaf0f356557ba5e18602458367bc398;p=openembedded.git

Merge ... '6a884c524b47bc199d7c8fb08262ba476bc25c13'
     and '7bd390b94b4b2318084dc7d7e08bd8b0aa9e129f'
---

c96ddb61ffaf0f356557ba5e18602458367bc398