Merge svn changes up to r30268
commit36dae0ee4485ec52cf727c33679ed315cd3d9c0a
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Mon, 25 Jan 2010 12:55:14 +0000 (25 14:55 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Mon, 25 Jan 2010 12:55:14 +0000 (25 14:55 +0200)
tree391169d767ca63b81434f016cb59c90f4c04ec85
parentdeb95362577935bec836ffd1f2669f424c5d34c8
parentaf6f08ce6ae77ecba16bea764ad3a193766e6d07
Merge svn changes up to r30268