Merge branch 'master' of git@github.com:xzilla/phppgadmin
authorRobert Treat <xzilla@users.sourceforge.net>
Sat, 27 Jun 2009 17:25:32 +0000 (13:25 -0400)
committerRobert Treat <xzilla@users.sourceforge.net>
Sat, 27 Jun 2009 17:25:32 +0000 (13:25 -0400)

Trivial merge