Merge remote branch 'origin/master' build-27219 build-27221 build-27223 build-27236 build-27240 build-27244 build-27252 build-27257 build-27259 build-27262 build-27264 build-27270 build-27276 build-27282 build-27284 build-27285 build-27286 build-27288
authorPavel Sher <pavel.sher@gmail.com>
Fri, 10 May 2013 19:33:54 +0000 (21:33 +0200)
committerPavel Sher <pavel.sher@gmail.com>
Fri, 10 May 2013 19:33:54 +0000 (21:33 +0200)

Trivial merge