Merge from trunk

This commit is contained in:
Charles Haley 2012-07-01 13:54:51 +02:00
commit 74cf96d1f1

Binary file not shown.