Merge commit 'origin/master' into recoveryinfra
authorHeikki Linnakangas <heikki@enterprisedb.com>
Wed, 18 Feb 2009 08:00:49 +0000 (10:00 +0200)
committerHeikki Linnakangas <heikki@enterprisedb.com>
Wed, 18 Feb 2009 08:00:49 +0000 (10:00 +0200)

Trivial merge