From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 30 Mar 2007 13:27:57 +0000 (+0000)
Subject: merge of '6f0db148d82d30078ed867182e31679b32d6fe62'
X-Git-Tag: Release-2010-05/1~8868^2~901^2~6^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c51133644c2ea2b1e75e962ccc6d24cdc107ff1c;p=openembedded.git

Merge ... '6f0db148d82d30078ed867182e31679b32d6fe62'
     and '844f33ecedcd7290081e897e5557e7a5b56b5724'
---

c51133644c2ea2b1e75e962ccc6d24cdc107ff1c