SVN-Revision: 30461
SVN-Revision: 30437
Signed-off-by: Andrew Andrianov <necromant@necromant.ath.cx> SVN-Revision: 28052