From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sun, 7 Jan 2007 18:42:27 +0000 (+0000)
Subject: merge of '5156b0a1647a5b55a939de58b3824e987070afee'
X-Git-Tag: Release-2010-05/1~9427
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddfc99c3ffea5f9b9b0478300d9204ed3abf8e2a;p=openembedded.git

Merge ... '5156b0a1647a5b55a939de58b3824e987070afee'
     and '7679548c35575ac65d8c4678ed5c0551529a56b6'
---

ddfc99c3ffea5f9b9b0478300d9204ed3abf8e2a