Merge branch 'master' of ../bernd_pg into notnull_constraint
authorBernd Helmle <mailings@oopsware.de>
Tue, 14 Jun 2011 14:50:50 +0000 (16:50 +0200)
committerBernd Helmle <mailings@oopsware.de>
Tue, 14 Jun 2011 14:50:50 +0000 (16:50 +0200)

Trivial merge