From 487372e6b005405e2107e9e2db81aa4c13cb0a93 Mon Sep 17 00:00:00 2001
From: Vivian Meazza <vivian.meazza@lineone.net>
Date: Sat, 10 Dec 2011 16:58:59 +0000
Subject: [PATCH] Merge branch 'master' of gitorious.org:fg/fgdata into work