From: Koen Kooi <koen@openembedded.org>
Date: Sun, 1 Jan 2006 15:23:21 +0000 (+0000)
Subject: merge of 186f778d1d10c9a87957e79c704e1336f936d92c
X-Git-Tag: Release-2010-05/1~9453^2~2814
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3fdac39ce87651a939251b37af17e100a530719;p=openembedded.git

merge of 186f778d1d10c9a87957e79c704e1336f936d92c
     and 9dd1ab5bac61847d1fe071f6cc0431ca2e4fe94f
---

a3fdac39ce87651a939251b37af17e100a530719