merge with trunk/2.5 at r23876

[[Split portion of a mixed commit.]]

source/blender/python/generic/Mathutils.c

@@ -912,7 +912,7 @@ static PyObject *M_Mathutils_LineIntersect( PyObject * self, PyObject * args )
 		PyErr_SetString( PyExc_TypeError, "expected 4 vector types\n" );
 		return NULL;
 	}
-	if( vec1->size != vec2->size || vec1->size != vec3->size || vec1->size != vec2->size) {
+	if( vec1->size != vec2->size || vec1->size != vec3->size || vec3->size != vec2->size) {
 		PyErr_SetString( PyExc_TypeError,"vectors must be of the same size\n" );
 		return NULL;
 	}

source/blender/python/generic/matrix.c

@@ -1315,7 +1315,7 @@ static PyObject *column_vector_multiplication(MatrixObject * mat, VectorObject*
 	}
 	vecNew[3] = 1.0f;
 
-	for(x = 0; x < mat->colSize; z++) {
+	for(x = 0; x < mat->colSize; x++) {
 		for(y = 0; y < mat->rowSize; y++) {
 			dot += mat->matrix[y][x] * vecCopy[y];
 		}