From a61a355a551b7f469bab8b2a129d506b060d640c Mon Sep 17 00:00:00 2001
From: Alexis Bory <alexis@duck.(none)>
Date: Mon, 28 Jun 2010 14:43:29 +0200
Subject: [PATCH] Merge branch 'master' of git://gitorious.org/fg/fgdata