Merge branch 'master' into libpg
authorPatrik Gornicz <Gornicz.P@gmail.com>
Fri, 1 May 2009 23:10:29 +0000 (19:10 -0400)
committerPatrik Gornicz <Gornicz.P@gmail.com>
Fri, 1 May 2009 23:10:29 +0000 (19:10 -0400)
commit41379c9cf8b7128f23a9c285d3e50cad0d5d2de4
treec77bfe61c940b84be9eaa47b6b200fedd1cfe5ae
parent00820fda063af0630b90eaf3e4e83898a6c8d928
parentd68972132cd142a12dddbc952c095931a2e0a1c6
Merge branch 'master' into libpg

Conflicts:
Makefile
Makefile