From: Koen Kooi <koen@openembedded.org>
Date: Tue, 17 Oct 2006 18:21:16 +0000 (+0000)
Subject: merge of '2ae6ecf2677fa2b9a53f45b824b830304af50db8'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~124
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=156527c87c0bee9fef81e1df940a790218ae7c52;p=openembedded.git

Merge ... '2ae6ecf2677fa2b9a53f45b824b830304af50db8'
     and 'ef1738131018813b36ed568f7299f38f6f22f3a2'
---

156527c87c0bee9fef81e1df940a790218ae7c52