commit 6f36b0290f6b2c10457f9123599fd9320dc73929 Merge: f57aee0 e2f3b68 Author: Dominik Mierzejewski <rpm at greysector.net> Date: Mon Aug 23 17:55:58 2010 +0200 Merge remote branch 'origin/f12/master' ---