Merge
authorKristjan Valur Jonsson <sweskman@gmail.com>
Wed, 30 Mar 2011 11:55:52 +0000 (11:55 +0000)
committerKristjan Valur Jonsson <sweskman@gmail.com>
Wed, 30 Mar 2011 11:55:52 +0000 (11:55 +0000)

Trivial merge