fixes for #476
Fixes for #476
Fixes for #520
Some formatting change
Merge branch 'trunk' of github.com:impetus-opensource/Kundera into trunk
Formating changes
Merge branch 'trunk' of github.com:impetus-opensource/Kundera into trunk