Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Sat, 11 Jul 2009 14:58:40 +0000 (16:58 +0200)
committerAndre Noll <maan@systemlinux.org>
Sat, 11 Jul 2009 14:58:40 +0000 (16:58 +0200)
commitaef566e9c8680629bac1ea84893b8b3ccd13da77
tree2575463d502595998d84c26a7f4c99ceb3fd95ba
parent9242741b62d726e7b673a3b10c62bbc8509a75ef
parent2a4d7bb5f5cecdbcbda6b9f9b531c919ecc6b161
Merge branch 'master' into next

Conflicts:
mood.c
error.h
mood.c