From: Graeme Gregory <dp@xora.org.uk>
Date: Fri, 19 Oct 2007 15:19:52 +0000 (+0000)
Subject: merge of '3b383ec14cc5013b29d65c58017c8778ca3ffa5f'
X-Git-Tag: Release-2010-05/1~8522
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4ad59a4bcefc874584d4e207501c3839cf99afc;p=openembedded.git

Merge ... '3b383ec14cc5013b29d65c58017c8778ca3ffa5f'
     and '6ad6f2ba299ea38ebdf7219f08f1c35b9c15a36a'
---

e4ad59a4bcefc874584d4e207501c3839cf99afc