Code

Merge from trunk
authorKrzysztof Kosiński <tweenk.pl@gmail.com>
Thu, 14 Jan 2010 16:01:49 +0000 (17:01 +0100)
committerKrzysztof Kosiński <tweenk.pl@gmail.com>
Thu, 14 Jan 2010 16:01:49 +0000 (17:01 +0100)

Trivial merge