Merge with current branch
authorPolina Dudnik <pdudnik@gmail.com>
Fri, 14 Aug 2009 20:30:25 +0000 (15:30 -0500)
committerPolina Dudnik <pdudnik@gmail.com>
Fri, 14 Aug 2009 20:30:25 +0000 (15:30 -0500)

Trivial merge