r1387: Merging the upgrade script from the 1.1.x branch to the trunk
authorRobert Sesek <rsesek@bluestatic.org>
Sat, 3 Feb 2007 22:02:21 +0000 (22:02 +0000)
committerRobert Sesek <rsesek@bluestatic.org>
Sat, 3 Feb 2007 22:02:21 +0000 (22:02 +0000)

Trivial merge