From: Koen Kooi <koen@openembedded.org>
Date: Sun, 17 Jun 2007 10:48:13 +0000 (+0000)
Subject: merge of '13509c938fd1a99107093b57954661739e7c0d13'
X-Git-Tag: Release-2010-05/1~8868^2~344^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=721bd132d7d9c3279d34160cb1beb15b3aba7565;p=openembedded.git

Merge ... '13509c938fd1a99107093b57954661739e7c0d13'
     and 'ccf6618308437769e6e810b1fa60e3d0e565e1dd'
---

721bd132d7d9c3279d34160cb1beb15b3aba7565