Merge remote branch 'shared/master'
authorintrigeri <intrigeri@boum.org>
Sat, 11 Dec 2010 12:15:33 +0000 (13:15 +0100)
committerintrigeri <intrigeri@boum.org>
Sat, 11 Dec 2010 12:15:33 +0000 (13:15 +0100)
Conflicts:
lib/puppet/parser/functions/split.rb


Trivial merge