Merge branches 'master' and 'preproc-paste-fix'
authorCyrill Gorcunov <gorcunov@gmail.com>
Tue, 13 Jul 2010 17:16:05 +0000 (21:16 +0400)
committerCyrill Gorcunov <gorcunov@gmail.com>
Tue, 13 Jul 2010 17:16:05 +0000 (21:16 +0400)

Trivial merge