Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Tue, 14 Jun 2011 20:35:21 +0200
changeset 967 2bb39e460186
parent 965 d64b07980755 (diff)
parent 966 e6f112b6f14b (current diff)
child 969 1f47c6ec53d6
Merge with stable