From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sun, 23 Dec 2007 19:47:06 +0000 (+0000)
Subject: merge of '2e363cde1e696e4fd40b45167cf73e5a7dd0109c'
X-Git-Tag: Release-2010-05/1~8080^2~41
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=177da4f8e6ad3f6c69d679ee3f2a6b99ddb9ff18;p=openembedded.git

Merge ... '2e363cde1e696e4fd40b45167cf73e5a7dd0109c'
     and '7c0754d01145df6906c2cfc824da2da420a2fe22'
---

177da4f8e6ad3f6c69d679ee3f2a6b99ddb9ff18