From: Andrea Manni <eaman@conny.andreamanni.com>
Date: Thu, 11 Jun 2009 13:15:02 +0000 (+0000)
Subject: Merge commit 'origin/master'
X-Git-Url: http://git.piffa.net/web?p=doc%2F.git;a=commitdiff_plain;h=730efeab352fddb32eed0d945aa08167c01338eb

Merge commit 'origin/master'
---

730efeab352fddb32eed0d945aa08167c01338eb