From: Koen Kooi <koen@openembedded.org>
Date: Mon, 1 Jan 2007 21:16:36 +0000 (+0000)
Subject: merge of 'dad836385287178e12f53cd63adfb7b695a4c09f'
X-Git-Tag: Release-2010-05/1~9453^2~46
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7a75369a604886422683f53404b8a5a9d0722a2;p=openembedded.git

Merge ... 'dad836385287178e12f53cd63adfb7b695a4c09f'
     and 'e9e449e083c624d15e55fc8135249c653031f4f1'
---

c7a75369a604886422683f53404b8a5a9d0722a2