changeset 12602:dc5920733a96

Trivial merge with stable except for ChangeLogs
author Jordi Gutiérrez Hermoso <jordigh@gmail.com>
date Tue, 12 Apr 2011 23:22:26 -0500
parents 7c000c70f873 (current diff) 8c52ab9842c9 (diff)
children 114ccc6da959
files doc/ChangeLog