upstream/0.8.svn.2010.01.15
b2165a73 · Merge remote branch 'trunk' into upstream ·