From: Koen Kooi <koen@openembedded.org>
Date: Sat, 2 Sep 2006 17:31:51 +0000 (+0000)
Subject: merge of '269c1d3f7a6a873041635f5ec41aacff978e166d'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~77
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13f062b8488b5e53ae1c74f140ed421550ee8923;p=openembedded.git

Merge ... '269c1d3f7a6a873041635f5ec41aacff978e166d'
     and '6401c65a46b33356819b171a03e513d4de5c0225'
---

13f062b8488b5e53ae1c74f140ed421550ee8923