From: Philip Balister <philip@balister.org>
Date: Thu, 26 Apr 2007 19:04:03 +0000 (+0000)
Subject: merge of '4363d4f2067c14e0433c8a93cf6595a62ffd8ea1'
X-Git-Tag: Release-2010-05/1~8868^2~660^2~43
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fe86ee223dc74fcddffe5563f66f2ca2577068c;p=openembedded.git

Merge ... '4363d4f2067c14e0433c8a93cf6595a62ffd8ea1'
     and '7859b1045fa3fae233d76f0be3b26d0d1ad35d8b'
---

5fe86ee223dc74fcddffe5563f66f2ca2577068c