From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sun, 17 Dec 2006 12:17:01 +0000 (+0000)
Subject: merge of '9ac27641c9c3a76dca545c31690c7f5780076ff7'
X-Git-Tag: Release-2010-05/1~9453^2~129^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edbc711c3614501aa4a1953eb1d2d6eb299088fc;p=openembedded.git

Merge ... '9ac27641c9c3a76dca545c31690c7f5780076ff7'
     and 'e6282b8a6c27894ff62776a8cd275d5f0a9a0efd'
---

edbc711c3614501aa4a1953eb1d2d6eb299088fc