Merge branch 'master' of git@github.com:xzilla/phppgadmin
authorRobert Treat <robert@client-109.wifi.omniti.com>
Fri, 27 Mar 2009 18:40:53 +0000 (14:40 -0400)
committerRobert Treat <robert@client-109.wifi.omniti.com>
Fri, 27 Mar 2009 18:40:53 +0000 (14:40 -0400)

Trivial merge