From 5753b2ce994be05ab1a556e29487e26a809375d3 Mon Sep 17 00:00:00 2001
From: Vivian Meazza <vivian.meazza@lineone.net>
Date: Mon, 2 Apr 2012 19:29:02 +0100
Subject: [PATCH] Merge branch 'master' of gitorious.org:fg/fgdata into work