From 1ddf8c7bd8a3fd64a0ecfe982f43b994f0dab29f Mon Sep 17 00:00:00 2001
From: Vivian Meazza <vivian.meazza@lineone.net>
Date: Wed, 12 Oct 2011 10:44:49 +0100
Subject: [PATCH] Merge branch 'master' of gitorious.org:fg/fgdata into work