merge 4861
authoroffice@chricar.at <>
Mon, 6 Sep 2010 06:59:47 +0000 (08:59 +0200)
committeroffice@chricar.at <>
Mon, 6 Sep 2010 06:59:47 +0000 (08:59 +0200)
commit428c6b541b9e5d997930e73edfcbd87d21d9bfc8
tree1638c702ac6d6dc5c63a62210ab01583b912534a
parent0720cb34f2cf8d3143eaa049e15e0ad9afe40bea
parent06eddc2b436cd0af37eeca09ac5405b5c9704a3a
merge 4861

bzr revid: office@chricar.at-20100904133133-8y1w1448gbdz38ar
bzr revid: office@chricar.at-20100905084002-2pxuxiw4pt5at4fi
bzr revid: office@chricar.at-20100906065947-msrm6jim885lv1e1