Merge branch 'error_procedur'
authorlampehe-local <henri.lampela@ixonos.com>
Fri, 11 Jun 2010 08:25:10 +0000 (11:25 +0300)
committerlampehe-local <henri.lampela@ixonos.com>
Fri, 11 Jun 2010 08:25:10 +0000 (11:25 +0300)

Trivial merge