Merge branch 'full-dependencies', as that is the branch that has been used for
authorJoachim Breitner <mail@joachim-breitner.de>
Thu, 5 Jul 2012 22:00:00 +0000 (00:00 +0200)
committerJoachim Breitner <mail@joachim-breitner.de>
Thu, 5 Jul 2012 22:00:00 +0000 (00:00 +0200)
most of the time now, and really should be master.


Trivial merge