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

Merge ... '04a1a2e0cc7e9b66f26b0c342d210418c07d6127'
     and '5d9ca4e1f6b8631c921bcc59406fb202e723f586'
---

06bd533ed1a1dbe243d97401a810d264a1561b98