From f98dc891a819962b172acfeb223c904b9444ffdb Mon Sep 17 00:00:00 2001
From: Detlef Faber <don@Pasyphae.(none)>
Date: Mon, 13 Dec 2010 20:53:34 +0100
Subject: [PATCH] Merge branch 'master' of git://gitorious.org/fg/fgdata