2.5 - Bugfixes for loading ManCandy

* Objects parented to bones now load correctly again (so Mancandy no longer looks like he had a run-in with a lawn mulcher). Was caused by a typo. I'm not sure how that got in there (or who did it)

* Action/Graph Editors would crash when loading files with Materials with some drivers.

source/blender/blenkernel/intern/object.c

@@ -1617,7 +1617,7 @@ static void ob_parbone(Object *ob, Object *par, float mat[][4])
 	bPoseChannel *pchan;
 	float vec[3];
 	
-	if (ob->type!=OB_ARMATURE) {
+	if (par->type!=OB_ARMATURE) {
 		Mat4One(mat);
 		return;
 	}