Merge commit 'refs/merge-requests/44' of git://gitorious.org/fg/fgdata into integration
authorVivian Meazza <vivian.meazza@lineone.net>
Thu, 16 Dec 2010 23:42:03 +0000 (23:42 +0000)
committerVivian Meazza <vivian.meazza@lineone.net>
Thu, 16 Dec 2010 23:42:03 +0000 (23:42 +0000)
commit8effd2e18bc8d677781f387cb7b3f2a1dde5e840
tree2d151241a46a7aa037a6d66a375359f30b5e1f15
parentee0f36d1e20951b8b12582e80dc6b04cd4e12a68
parentec87e92776152676c854fec4cc86c94905eea991
Merge commit 'refs/merge-requests/44' of git://gitorious.org/fg/fgdata into integration