Merging r38694 through r38739 from trunk into vgroup_modifiers
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 26 Jul 2011 18:28:43 +0000 (18:28 +0000)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 26 Jul 2011 18:28:43 +0000 (18:28 +0000)

Trivial merge