commit c6a19ec15ae0d39f977323f1a82aed56af89198c
Merge: 53ec809 c438322
Author: Paul van Tilburg <paul@mozcode.nl>
Date:   Wed Jun 6 11:41:00 2012 +0200

    Merge branch 'support/camping-2.2' into development (closes: #804d96)