From: Koen Kooi <koen@openembedded.org>
Date: Sun, 18 Feb 2007 11:35:36 +0000 (+0000)
Subject: merge of '1fc4ea9615a3789569ba8f07b7090012fce2afbf'
X-Git-Tag: Release-2010-05/1~9234^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa5be9a374e7c4279f4d86d299d518538bc7bead;p=openembedded.git

Merge ... '1fc4ea9615a3789569ba8f07b7090012fce2afbf'
     and 'e63a2eefb4ae9542b7ac7ee72c2f0aad1d534886'
---

aa5be9a374e7c4279f4d86d299d518538bc7bead