From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 29 Sep 2006 21:40:13 +0000 (+0000)
Subject: merge of '497bad113a4cfe870e10990d7361bc8a266713e5'
X-Git-Tag: Release-2010-05/1~9453^2~666^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=680de2841130d3a7e079b0d81e0aa290d109a2ca;p=openembedded.git

Merge ... '497bad113a4cfe870e10990d7361bc8a266713e5'
     and '7f3fc45ed4f6bbc596b8513870bdaa4ecc6576ce'
---

680de2841130d3a7e079b0d81e0aa290d109a2ca