Merge branch 'master' of git@github.com:gritzko/swift
authorVictor Grishchenko <victor.grishchenko@gmail.com>
Thu, 4 Feb 2010 13:49:49 +0000 (14:49 +0100)
committerVictor Grishchenko <victor.grishchenko@gmail.com>
Thu, 4 Feb 2010 13:49:49 +0000 (14:49 +0100)

Trivial merge