From: Graeme Gregory <dp@xora.org.uk>
Date: Sun, 7 Oct 2007 19:46:47 +0000 (+0000)
Subject: merge of '22e9bcb718159eba1d1e60d8a3fda75fdc17fe31'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~115
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25bd38be9bc08d566ae04b86f5489cfe203b1188;p=openembedded.git

Merge ... '22e9bcb718159eba1d1e60d8a3fda75fdc17fe31'
     and 'd36c82004ef7eae9956811400405963058155b77'
---

25bd38be9bc08d566ae04b86f5489cfe203b1188