Merge remote-tracking branch 'origin/master'
authorIavor S. Diatchki <iavor.diatchki@gmail.com>
Sat, 29 Sep 2012 21:52:54 +0000 (14:52 -0700)
committerIavor S. Diatchki <iavor.diatchki@gmail.com>
Sat, 29 Sep 2012 21:52:54 +0000 (14:52 -0700)

Trivial merge