Merge branch 'master' into nikitakit_ducks
authorNikita Kitaev <nikitakit@gmail.com>
Sat, 28 Nov 2009 19:20:30 +0000 (11:20 -0800)
committerNikita Kitaev <nikitakit@gmail.com>
Sat, 28 Nov 2009 19:20:30 +0000 (11:20 -0800)

Trivial merge