Commit d1445b7528f17910b9d4301617b8129ee30d1c3e

nulltoken 2012-08-27T15:24:27

branch: reduce code duplication