From: Erik Hovland <erik@hovland.org>
Date: Mon, 22 May 2006 19:05:24 +0000 (+0000)
Subject: merge of 6b93ecbe268d25fd1431774e86d13249d43b909c
X-Git-Tag: Release-2010-05/1~9453^2~1624^2~1^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc0711ae1805e4cf8654de0cf8d48b2389990526;p=openembedded.git

merge of 6b93ecbe268d25fd1431774e86d13249d43b909c
     and baa8f71c79346cb61aec79abc76df5849f08e76f
---

fc0711ae1805e4cf8654de0cf8d48b2389990526