From: Koen Kooi <koen@openembedded.org>
Date: Fri, 19 Oct 2007 19:45:58 +0000 (+0000)
Subject: merge of 'aa36aa92826b8f74328b39933671dd201b795054'
X-Git-Tag: Release-2010-05/1~8516
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c99842e673f8bc75dfa3d8600fba9970251549ff;p=openembedded.git

Merge ... 'aa36aa92826b8f74328b39933671dd201b795054'
     and 'bc72cbe491bc556448f73971b4b962b9a60c9dd9'
---

c99842e673f8bc75dfa3d8600fba9970251549ff