Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Mon, 20 Jun 2011 12:02:52 +0200
changeset 969 1f47c6ec53d6
parent 967 2bb39e460186 (diff)
parent 968 8d821e2fed38 (current diff)
child 972 0d4e44410b4d
Merge with stable