Merge branch '312/upstream' into 312/master
authorStephane Glondu <steph@glondu.net>
Sat, 15 May 2010 22:13:11 +0000 (00:13 +0200)
committerStephane Glondu <steph@glondu.net>
Sat, 15 May 2010 22:13:11 +0000 (00:13 +0200)
commitc66aecba1cf8994161ecf03f370f5c92c820b341
tree2f241a5425b21c6a0a41ffdf9444f0bf4b2c9428
parent65f64af7d0e2241dc286f67996d85e2d377df436
parent2dab435cba5d8ab12db08200bcee88c4668c1370
Merge branch '312/upstream' into 312/master