From: root <root@cassidy.cs.princeton.edu>
Date: Fri, 9 Jul 2010 09:50:04 +0000 (-0400)
Subject: Merge commit 'origin/master'
X-Git-Url: http://git.onelab.eu/?p=sliceimage.git;a=commitdiff_plain;h=3903163095e96e5e0c0aed45597bb8d637ea1c2f

Merge commit 'origin/master'
---

3903163095e96e5e0c0aed45597bb8d637ea1c2f