From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Mon, 3 Dec 2007 12:28:51 +0000 (+0000)
Subject: merge of '21f54c80b635c2c7554e7423c333597138564f8d'
X-Git-Tag: Release-2010-05/1~8236^2~7^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d16b4711f990560a302713ca5f9021f6f79a716;p=openembedded.git

Merge ... '21f54c80b635c2c7554e7423c333597138564f8d'
     and '3e1b85fb027d607397b8ae0cf0cbedfbd3f273a2'
---

3d16b4711f990560a302713ca5f9021f6f79a716