Code review request

```
Purpose of code changes on this branch:


When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk









```

Original issue reported on code.google.com by `v.Icelus` on 7 Apr 2009 at 3:55
