From: Koen Kooi <koen@openembedded.org>
Date: Mon, 16 Oct 2006 13:58:07 +0000 (+0000)
Subject: merge of '3a72c4b2962d909444aaaee9569be3bb90169577'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~156^2~1^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00a1aa7d8aa69edfcde4cbb2c96597c1f63e6a43;p=openembedded.git

Merge ... '3a72c4b2962d909444aaaee9569be3bb90169577'
     and '514b31d89c294ce11810ee76a2138d455216409b'
---

00a1aa7d8aa69edfcde4cbb2c96597c1f63e6a43