From 9ca34d9644bc5e61f0c2b9f646bbf3dd6a75b795 Mon Sep 17 00:00:00 2001
From: Vivian Meazza <vivian.meazza@lineone.net>
Date: Mon, 8 Aug 2011 16:54:10 +0100
Subject: [PATCH] Merge branch 'master' of gitorious.org:fg/fgdata