Merge branch 'experimental' into the00z
authorAbel `00z' Camarillo <00z@the00z.org>
Sat, 11 Jul 2009 20:51:42 +0000 (15:51 -0500)
committerAbel `00z' Camarillo <00z@the00z.org>
Sat, 11 Jul 2009 20:51:42 +0000 (15:51 -0500)

Trivial merge