upstream/1.002+20111215.1

Martin Erik Werner

@arand-guest

3e5549d6 · Imported Upstream version 1.002+20111215.1 · Dec 15, 2011

Upstream version 1.002+20111215.1