Merge commit 'refs/merge-requests/54' of git://gitorious.org/fg/fgdata into integration
authorVivian Meazza <vivian.meazza@lineone.net>
Mon, 10 Jan 2011 22:21:42 +0000 (22:21 +0000)
committerVivian Meazza <vivian.meazza@lineone.net>
Mon, 10 Jan 2011 22:21:42 +0000 (22:21 +0000)
commit2692b787841b3bf6cc2360e0ff966b813447cc7c
tree0b051cb7b6e136e87c6102f9f9c0bc1906c40516
parent4bf5f685722a9db98672ae5cb6991bbcb78e141a
parent52683b094efac1ddeb442a9729bac5fc1487fdc3
Merge commit 'refs/merge-requests/54' of git://gitorious.org/fg/fgdata into integration