Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Sun, 6 Jun 2010 16:35:47 +0000 (18:35 +0200)
committerAndre Noll <maan@systemlinux.org>
Sun, 6 Jun 2010 16:35:47 +0000 (18:35 +0200)
commit9b565c60fd159e12d255bb18db9dbff066deebea
treef44f1cabaa43075be0a18a08efb7a9097d73fc60
parent04d57a4d05ce0a0f8d16c32d14d056e312527808
parent5ebdf3a92f55c582f7b23236b4b403faa76f1f19
Merge branch 'maint'

Conflicts:
gui.c
gui.c