From: Koen Kooi <koen@openembedded.org>
Date: Sat, 29 Jul 2006 20:44:42 +0000 (+0000)
Subject: merge of '7ca686a64736f6787bbb283a3f9d21966212d549'
X-Git-Tag: Release-2010-05/1~9453^2~1052
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65d153d4833f9aba1ee349abfcb7f76ab61e6e31;p=openembedded.git

Merge ... '7ca686a64736f6787bbb283a3f9d21966212d549'
     and 'b3c3672e33744be20e96f868564159e2b02bb718'
---

65d153d4833f9aba1ee349abfcb7f76ab61e6e31