merge
authorPolina Dudnik <pdudnik@gmail.com>
Thu, 16 Jul 2009 20:40:48 +0000 (15:40 -0500)
committerPolina Dudnik <pdudnik@gmail.com>
Thu, 16 Jul 2009 20:40:48 +0000 (15:40 -0500)

Trivial merge