From: Koen Kooi <koen@openembedded.org>
Date: Sun, 12 Mar 2006 13:29:55 +0000 (+0000)
Subject: merge of 1ba45cf53c0878304cb1ded93545b1938b45606f
X-Git-Tag: Release-2010-05/1~9453^2~2233^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5dc41f8648a8c57524696b213460ae9b1dcab89e;p=openembedded.git

merge of 1ba45cf53c0878304cb1ded93545b1938b45606f
     and 5478d2000cb4fb6a9810fc0fd5cb8d1fc2903536
---

5dc41f8648a8c57524696b213460ae9b1dcab89e