Merge branch 'next'
commit4717b747adec242bc47b7a6c78b74c1b7f6e5c41
authorMichael Wild <themiwi@users.sourceforge.net>
Wed, 15 Jun 2011 13:36:58 +0000 (15 15:36 +0200)
committerMichael Wild <themiwi@users.sourceforge.net>
Wed, 15 Jun 2011 13:36:58 +0000 (15 15:36 +0200)
treedee4460d06b8fc219a884d416aadfd337298ec64
parent2a95cadadfee85c97720a46e9082216aa0da096c
parent5c67b6d90c69742b3c784ed1a3332bdc71bda94a
Merge branch 'next'