Merge branch 'master' of git://github.com/gritzko/swift
authorVictor Grishchenko (mughal) <victor.grishchenko@gmail.com>
Mon, 15 Feb 2010 14:40:02 +0000 (15:40 +0100)
committerVictor Grishchenko (mughal) <victor.grishchenko@gmail.com>
Mon, 15 Feb 2010 14:40:02 +0000 (15:40 +0100)

Trivial merge