From: Koen Kooi <koen@openembedded.org>
Date: Sat, 21 Jun 2008 12:19:35 +0000 (+0000)
Subject: merge of '325cca716bfbf3db0f668af761161a7b40a705e8'
X-Git-Tag: Release-2010-05/1~6655
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7956813ed6ef27c11f63d2d3bfdeae6ef7b71b76;p=openembedded.git

Merge ... '325cca716bfbf3db0f668af761161a7b40a705e8'
     and 'ea9bece0e1c09d6d7e85904db6d8adeb4f4588c2'
---

7956813ed6ef27c11f63d2d3bfdeae6ef7b71b76