From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Mon, 1 Jan 2007 23:59:20 +0000 (+0000)
Subject: merge of '1897dabec68161c37cd3543ac7f113e99557ec54'
X-Git-Tag: Release-2010-05/1~9453^2~40^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=beb966d9a6865a7d6539f8b9f965247dc560c003;p=openembedded.git

Merge ... '1897dabec68161c37cd3543ac7f113e99557ec54'
     and 'd0e7b7f2c99a7d43f5de13d839883dcca9d52dae'
---

beb966d9a6865a7d6539f8b9f965247dc560c003