Merge branch 'master' of node301:./swift
authorVictor Grishchenko <victor.grishchenko@gmail.com>
Tue, 9 Feb 2010 14:50:11 +0000 (15:50 +0100)
committerVictor Grishchenko <victor.grishchenko@gmail.com>
Tue, 9 Feb 2010 14:50:11 +0000 (15:50 +0100)

Trivial merge