~ chicken-core (chicken-5) cc65bc9912a7a3e704c6d025afaef0c0e6e2e5e0

commit cc65bc9912a7a3e704c6d025afaef0c0e6e2e5e0
Merge: c5eafcc6 ce65dcc5
Author:     felix <felix@z.(none)>
AuthorDate: Tue Nov 2 15:51:21 2010 +0100
Commit:     felix <felix@z.(none)>
CommitDate: Tue Nov 2 15:51:21 2010 +0100

    fixed conflict

diff --cc manual/Acknowledgements
index 68fc99c3,5cc2216a..698f4d15
--- a/manual/Acknowledgements
+++ b/manual/Acknowledgements
@@@ -32,22 -32,22 +32,22 @@@ G. Miller, Mikael, Bruce Mitchener, Fad
  E. Moore, Julian Morrison, Dan Muresan, David N. Murray, "nicktick",
  Lars Nilsson, Ian Oversby, "o.t.", Gene Pavlovsky, Levi Pearson,
  Jeronimo Pellegrini, Nicolas Pelletier, Derrell Piper, Carlos Pita,
- Robin Lee Powell, "Pupeno", Davide Puricelli, "presto", Doug Quale,
- Imran Rafique, Eric Raible, Ivan Raikov, Joel Reymont, Chris Roberts,
- Eric Rochester, Paul Romanchenko, Andreas Rottman, David Rush, Lars
- Rustemeier, Daniel Sadilek, Oskar Schirmer, Burton Samograd, Reed
- Sheridan, Ronald Schroeder, Spencer Schumann, Ivan Shcheklein, Alex
- Shinn, Ivan Shmakov, "Shmul", Tony Sidaway, Jeffrey B. Siegal, Andrey
- Sidorenko, Michele Simionato, Iruata Souza, Volker Stolz, Jon Strait,
- Dorai Sitaram, Robert Skeels, Jason Songhurst, Clifford Stein, Sunnan,
- Zbigniew Szadkowski, Rick Taube, Nathan Thern, Mike Thomas, Minh Thu,
- Christian Tismer, Andre van Tonder, John Tobey, Henrik Tramberend,
- Vladimir Tsichevsky, Neil van Dyke, Sam Varner, Taylor Venable, Sander
- Vesik, Jaques Vidrine, Panagiotis Vossos, Shawn Wagner, Peter Wang, Ed
- Watkeys, Brad Watson, Thomas Weidner, Goeran Weinholt, Matthew
- Welland, Drake Wilson, Joerg Wittenberger, Peter Wright, Mark Wutka,
- Richard Zidlicky and Houman Zolfaghari for bug-fixes, tips and
- suggestions.
+ Robin Lee Powell, Alan Post, "Pupeno", Davide Puricelli, "presto",
+ Doug Quale, Imran Rafique, Eric Raible, Ivan Raikov, Joel Reymont,
+ Chris Roberts, Eric Rochester, Paul Romanchenko, Andreas Rottman,
+ David Rush, Lars Rustemeier, Daniel Sadilek, Oskar Schirmer, Burton
+ Samograd, Reed Sheridan, Ronald Schroeder, Spencer Schumann, Ivan
+ Shcheklein, Alex Shinn, Ivan Shmakov, "Shmul", Tony Sidaway, Jeffrey
 -B. Siegal, Andrey Sidorenko, Michele Simionato, Volker Stolz, Jon
 -Strait, Dorai Sitaram, Robert Skeels, Jason Songhurst, Clifford Stein,
 -Sunnan, Zbigniew Szadkowski, Rick Taube, Nathan Thern, Mike Thomas,
 -Minh Thu, Christian Tismer, Andre van Tonder, John Tobey, Henrik
 -Tramberend, Vladimir Tsichevsky, Neil van Dyke, Sam Varner, Taylor
 -Venable, Sander Vesik, Jaques Vidrine, Panagiotis Vossos, Shawn
++B. Siegal, Andrey Sidorenko, Michele Simionato, Iruata Souza, Volker
++Stolz, Jon Strait, Dorai Sitaram, Robert Skeels, Jason Songhurst,
++Clifford Stein, Sunnan, Zbigniew Szadkowski, Rick Taube, Nathan Thern,
++Mike Thomas, Minh Thu, Christian Tismer, Andre van Tonder, John Tobey,
++Henrik Tramberend, Vladimir Tsichevsky, Neil van Dyke, Sam Varner,
++Taylor Venable, Sander Vesik, Jaques Vidrine, Panagiotis Vossos, Shawn
+ Wagner, Peter Wang, Ed Watkeys, Brad Watson, Thomas Weidner, Goeran
+ Weinholt, Matthew Welland, Drake Wilson, Joerg Wittenberger, Peter
+ Wright, Mark Wutka, Richard Zidlicky and Houman Zolfaghari for
+ bug-fixes, tips and suggestions.
  
  CHICKEN uses the "irregex" regular expression package written by Alex Shinn.