Merge branch 'nikitakit_ducks'
authorCarlos Lopez <genetita@gmail.com>
Sat, 23 Jan 2010 09:46:38 +0000 (10:46 +0100)
committerCarlos Lopez <genetita@gmail.com>
Sat, 23 Jan 2010 09:46:38 +0000 (10:46 +0100)

Trivial merge