2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19323:HEAD

Notes:
* blenderbuttons and ICON_SNAP_PEEL_OBJECT were not merged.

source/gameengine/GameLogic/SCA_ExpressionController.h

@@ -59,7 +59,7 @@ public:
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
 
-//	virtual PyObject* _getattr(const char *attr);
+//	virtual PyObject* py_getattro(PyObject *attr);
 
 };