From d2399ade67f34a03101f2850d829b6e49c0b04d5 Mon Sep 17 00:00:00 2001
From: Gijs de Rooy <gijsrooy@hotmail.com>
Date: Wed, 18 Aug 2010 22:55:18 +0200
Subject: [PATCH] Merge branch 'master' of git://gitorious.org/fg/fgdata