Merge branch 'master' into nikitakit_master
authorNikita Kitaev <nikitakit@gmail.com>
Thu, 15 Apr 2010 23:23:23 +0000 (16:23 -0700)
committerNikita Kitaev <nikitakit@gmail.com>
Thu, 15 Apr 2010 23:23:23 +0000 (16:23 -0700)

Trivial merge