Merge commit 'origin/master' into recoveryinfra
authorHeikki Linnakangas <heikki@enterprisedb.com>
Thu, 5 Feb 2009 16:23:36 +0000 (18:23 +0200)
committerHeikki Linnakangas <heikki@enterprisedb.com>
Thu, 5 Feb 2009 16:23:36 +0000 (18:23 +0200)

Trivial merge