merge
authorEli Bendersky <eliben@gmail.com>
Fri, 23 Sep 2011 08:00:34 +0000 (11:00 +0300)
committerEli Bendersky <eliben@gmail.com>
Fri, 23 Sep 2011 08:00:34 +0000 (11:00 +0300)

Trivial merge