Merging r38740 through r38764 from trunk into vgroup_modifiers.
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 27 Jul 2011 18:57:57 +0000 (18:57 +0000)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 27 Jul 2011 18:57:57 +0000 (18:57 +0000)

Trivial merge