From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sun, 3 Dec 2006 20:56:56 +0000 (+0000)
Subject: merge of '9ddee6d313b8df8d5c53bbbdff56ee8fad2b2a17'
X-Git-Tag: Release-2010-05/1~9453^2~204^2~23
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82266fc0cc7692fcb19d86a62e628727fad32257;p=openembedded.git

Merge ... '9ddee6d313b8df8d5c53bbbdff56ee8fad2b2a17'
     and 'cfb319cb7a07884581f37a430f62b7e11bfb6376'
---

82266fc0cc7692fcb19d86a62e628727fad32257