Merge branch 'master' of tomsrv:tomamp master
authortmarki <tmarki@gmail.com>
Mon, 30 Aug 2010 15:48:45 +0000 (17:48 +0200)
committertmarki <tmarki@gmail.com>
Mon, 30 Aug 2010 15:48:45 +0000 (17:48 +0200)

Trivial merge