Commit 2b92a154b66f213b664e44544048a2df7708b9de

nulltoken 2012-07-11T11:20:20

commit: reduce code duplication