Merge branch 'master' of github.com:gritzko/swift
authorVictor Grishchenko <victor.grishchenko@gmail.com>
Tue, 9 Feb 2010 18:36:15 +0000 (19:36 +0100)
committerVictor Grishchenko <victor.grishchenko@gmail.com>
Tue, 9 Feb 2010 18:36:15 +0000 (19:36 +0100)

Trivial merge