From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Mon, 25 Dec 2006 22:05:50 +0000 (+0000)
Subject: merge of '7a9c6dcd00355e7f104559fd3a74974aad0d5967'
X-Git-Tag: Release-2010-05/1~9453^2~110
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e84333378b37d17ab39c5a9513c22d829487861;p=openembedded.git

Merge ... '7a9c6dcd00355e7f104559fd3a74974aad0d5967'
     and 'd8f40f8cb3de1c538fda459dafaa6d8595095b6e'
---

1e84333378b37d17ab39c5a9513c22d829487861