From: Koen Kooi <koen@openembedded.org>
Date: Mon, 4 Aug 2008 13:14:37 +0000 (+0000)
Subject: merge of '3d8fcb3e38b76cf853ceee12d6cd8f1d518b546b'
X-Git-Tag: Release-2010-05/1~6365^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5194151b2cfa37b8444614603dda36b067b2a86c;p=openembedded.git

Merge ... '3d8fcb3e38b76cf853ceee12d6cd8f1d518b546b'
     and '7d3ee6f9dd094cfa51709c24c15492d19ad64af7'
---

5194151b2cfa37b8444614603dda36b067b2a86c