Merging changes from dev branch
authorn.hoffmann <n.hoffmann@localhost>
Wed, 14 Mar 2012 12:20:09 +0000 (12:20 +0000)
committern.hoffmann <n.hoffmann@localhost>
Wed, 14 Mar 2012 12:20:09 +0000 (12:20 +0000)
commit95cc223be4fe352f635deed96e294d3c736c574e
tree03cb4b8b6b6d9ca4cc36b83bc969196199377916
parente1bb528dbd7c8c11fe48a4ed84ede522daf08329
Merging changes from dev branch