# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1267653905 0
# Node ID 9384ee36fc03be15319a5331e32008366f192088
# Parent  48e8832e5cab5ad8a124fcc85dc08f7227325b24# Parent  1edeb8fe7d149edb7861525791d6ba91aa513678
Merge 0.6.2/waqas with 0.6.2/MattJ