upstream/2.7+20120506

Andreas Bombe

@aeb

d2eb81ab · Imported Upstream version 2.7+20120506 · May 24, 2012

Upstream version 2.7+20120506