Fix lookup within parents' scope (Issue#23)
Merge pull request #26 from mkubala/hotfix/diamondInheritanceBug

Fix lookup within parents' scope (Issue#23)
0.7.3. release
Merge branch 'master' into scala-2.10

Conflicts:
	project/Build.scala