merge 99762:100015
authorJb Evain <jbevain@gmail.com>
Mon, 7 Apr 2008 13:35:08 +0000 (13:35 -0000)
committerJb Evain <jbevain@gmail.com>
Mon, 7 Apr 2008 13:35:08 +0000 (13:35 -0000)
commitbf259758f5795c316ca237af59c490deab41fa4a
tree033030c86eb643aa56fde1d3b1126209d2e5b6f9
parentc5191f66a55d83bd4d37530264f04fcfba9257a6
parentb66d85e6f2e67bdba7e0cf14a3cb79b58de4643f
merge 99762:100015

svn path=/branches/jb/ml2/mcs/; revision=100016