Merge branch 'nikitakit_master'
authorCarlos Lopez <genetita@gmail.com>
Wed, 30 Jun 2010 16:32:09 +0000 (18:32 +0200)
committerCarlos Lopez <genetita@gmail.com>
Wed, 30 Jun 2010 16:32:09 +0000 (18:32 +0200)

Trivial merge