Merge branch 'master' into bloom
authorAndre Noll <maan@systemlinux.org>
Thu, 25 Dec 2008 11:23:10 +0000 (12:23 +0100)
committerAndre Noll <maan@systemlinux.org>
Thu, 25 Dec 2008 11:23:10 +0000 (12:23 +0100)
commit25e4fb919ce9b87aeb5aa3456b687c5c3ba55a9e
treeca534761351bbbf5414db7d0421810178512503f
parent78f42703571424f6d409a709fead7377f7a10616
parentc7d5ddb6906ab8a18181fee29ac78d604db5fdb9
Merge branch 'master' into bloom

Conflicts:
create.c
create.c