Avoid dict comprehension syntax for Python 2.6 compatibility.
Merge branch 'py26' into aron