commit 65a4471e148f67fa69f1aa6040e388c0ad2ce77b Merge: d15fa26 2f57994 Author: Patrick Uiterwijk <puiterwijk at gmail.com> Date: Thu Jul 19 19:12:12 2012 +0200 Merge branch 'master' into el6 ---