merge numa localization
merge numa localization

git-svn-id: 1a7f94dacd22ca84f576b2fd1f92e88552bbc984@15860 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda

pscedu/slash2-stable,pscedu/slash2-stable,pscedu/slash2-stable,pscedu/slash2-stable,pscedu/slash2-stable,pscedu/slash2-stable,pscedu/slash2-stable