mathutils.Matrix in 2.5

Hello, I fear my weakness in matrix math is catching up with me!

I was converting an old 2.4 script until I got stuck, so a few questions that should help clear things up.

Is there a replacement for Matrix(*object.orientation), as far as I know they made it so object.orientation always returns a matrix.

How about ScaleMatrix()? I found Matrix.Scale() but does that return the same value?

Thanks
Ex.

From the desciption I asume that both create a Matrix that represent a scale transformation.

It looks like this:

assuming s is the scale factor:

[[s, 0, 0]
,[0, s, 0]
,[0, 0, s]]