Merge remote branch 'upstream/master'
authorVitja Makarov <vitja.makarov@gmail.com>
Tue, 18 Jan 2011 19:38:27 +0000 (22:38 +0300)
committerVitja Makarov <vitja.makarov@gmail.com>
Tue, 18 Jan 2011 19:38:27 +0000 (22:38 +0300)

Trivial merge