Merge branch 'karushka'
authorSven Schöling <s.schoeling@linet-services.de>
Fri, 3 Jul 2009 08:40:58 +0000 (10:40 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Fri, 3 Jul 2009 08:40:58 +0000 (10:40 +0200)
commit20bb56c1d57dde9492fef150edbfe0149a07ff08
treebbfb8e8ef07241ce5c768c29747f60181fb0e4c3
parent6e61f90a8efa2fe1ed10bac083ac80875ffd5ca0
parent8e08bedb4b4bfb97adcb4f4eb94a60012ca3729b
Merge branch 'karushka'