Merging latest changes from dev branch
authorn.hoffmann <n.hoffmann@localhost>
Wed, 14 Mar 2012 10:21:09 +0000 (10:21 +0000)
committern.hoffmann <n.hoffmann@localhost>
Wed, 14 Mar 2012 10:21:09 +0000 (10:21 +0000)
commite1bb528dbd7c8c11fe48a4ed84ede522daf08329
tree03cb4b8b6b6d9ca4cc36b83bc969196199377916
parentd11755bb2b36485ae202f7c92a9ba700e1963638
parent553640800f0b1442bed4ee4231d401515bd93099
Merging latest changes from dev branch