upstream/1.2.0.d20100117

Luca Falavigna

@dktrkranz

48f19e9e · Imported Upstream version 1.2.0.d20100117 · Jan 23, 2010

Upstream version 1.2.0.d20100117