From f5503ff22f78836948d6beef1622c4ca53c18db7 Mon Sep 17 00:00:00 2001
From: Vivian Meazza <vivian.meazza@lineone.net>
Date: Fri, 6 Aug 2010 22:04:35 +0100
Subject: [PATCH] Merge branch 'master' of git://gitorious.org/fg/fgdata