Merge branch 'master' into cookies_refactored
authorlampehe-local <henri.lampela@ixonos.com>
Fri, 28 May 2010 12:32:21 +0000 (15:32 +0300)
committerlampehe-local <henri.lampela@ixonos.com>
Fri, 28 May 2010 12:32:21 +0000 (15:32 +0300)

Trivial merge