updated 12.08.2013

Signed-off-by: sreedhar-kumar <sreedhar.kumar@imtek.de>
Merge branch 'origin/master'