Merge remote-tracking branch 'upstream/master'
authorJesus de Mula Cano <demula@gmail.com>
Sun, 6 Mar 2011 17:09:32 +0000 (18:09 +0100)
committerJesus de Mula Cano <demula@gmail.com>
Sun, 6 Mar 2011 17:09:32 +0000 (18:09 +0100)

Trivial merge