From: Koen Kooi <koen@openembedded.org>
Date: Mon, 19 Nov 2007 15:17:39 +0000 (+0000)
Subject: merge of '7a0881668d38c0d3e64ef7ff7fa74e208b9e2d47'
X-Git-Tag: Release-2010-05/1~8342
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=517c4f8346f966c6d9f3976955415f38d5d4d38d;p=openembedded.git

Merge ... '7a0881668d38c0d3e64ef7ff7fa74e208b9e2d47'
     and '9e0e042cf0a2ae14b02a20db24de2d6ac3ce71c3'
---

517c4f8346f966c6d9f3976955415f38d5d4d38d