Code

Merged branch 'experimental'.
authorSebastian Harl <sh@tokkee.org>
Sat, 21 Nov 2009 18:14:29 +0000 (19:14 +0100)
committerSebastian Harl <sh@tokkee.org>
Sat, 21 Nov 2009 18:14:29 +0000 (19:14 +0100)
commit2d7eb66e602a5c53dc2fafd70aa6ec4d7b447be9
treea9429e1c08255afbcc3bfe456726708996565179
parent05972e970514b4e7d0d75892d5457f2d99c6fd36
parent816d3c844963edd0b166b7db98b0c810417af848
Merged branch 'experimental'.

Conflicts:
debian/changelog
debian/changelog
debian/rules