commit 5a41ddddf0cb7d7dd8eceb14b395bdc54c0e56ae Merge: 62fcd9a 2f57994 Author: Patrick Uiterwijk <puiterwijk at gmail.com> Date: Thu Jul 19 19:10:26 2012 +0200 Merge branch 'master' into el5 ---